Revert "lib: A small optimization for the hash iterate and walk functions"

This reverts commit fc61644e440c875eefa222ab34d726c6281ca806.

diff --git a/lib/hash.c b/lib/hash.c
index 37f6cdcc8f86a4c3d65e405131942fa2d1fe1367..ee5401b2367a4816111439863c3b67f1d8df51d7 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -241,21 +241,15 @@ void hash_iterate(struct hash *hash, void (*func)(struct hash_backet *, void *),
        unsigned int i;
        struct hash_backet *hb;
        struct hash_backet *hbnext;
-       uint32_t count = 0;
 
-       for (i = 0; i < hash->size; i++) {
+       for (i = 0; i < hash->size; i++)
                for (hb = hash->index[i]; hb; hb = hbnext) {
                        /* get pointer to next hash backet here, in case (*func)
                         * decides to delete hb by calling hash_release
                         */
                        hbnext = hb->next;
                        (*func)(hb, arg);
-                       count++;
-
                }
-               if (count == hash->count)
-                       return;
-       }
 }
 
 void hash_walk(struct hash *hash, int (*func)(struct hash_backet *, void *),
@@ -265,7 +259,6 @@ void hash_walk(struct hash *hash, int (*func)(struct hash_backet *, void *),
        struct hash_backet *hb;
        struct hash_backet *hbnext;
        int ret = HASHWALK_CONTINUE;
-       uint32_t count = 0;
 
        for (i = 0; i < hash->size; i++) {
                for (hb = hash->index[i]; hb; hb = hbnext) {
@@ -276,10 +269,7 @@ void hash_walk(struct hash *hash, int (*func)(struct hash_backet *, void *),
                        ret = (*func)(hb, arg);
                        if (ret == HASHWALK_ABORT)
                                return;
-                       count++;
                }
-               if (count == hash->count)
-                       return;
        }
 }
 

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index b56eaa899f5fb7a2b55e13ff236fa34bc667f792..82e744ac4d0d535f79e09de7d9e68006050bd955 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2144,6 +2144,7 @@ DEFUN (vtysh_show_poll,
        "Thread Poll Information\n")
 {
        unsigned int i;
+       int idx = 0;
        int ret = CMD_SUCCESS;
        char line[100];