From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 6 Jul 2018 14:18:11 +0000 (-0400)
Subject: Revert "lib: A small optimization for the hash iterate and walk functions"
X-Git-Tag: frr-6.1-dev~187^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=df66eb2eeb7189ab27be49aa8637938cdcf43cb6;p=matthieu%2Ffrr.git

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 37f6cdcc8f..ee5401b236 100644
--- 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 b56eaa899f..82e744ac4d 100644
--- 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];