Subject: [RFT 3/4] fib_trie: fix sparse warnings

From: Stephen Hemminger <[email-masked]>
Date: Fri, 27 Jul 2007 08:59:20 +0100

There were a couple of places where sparse found declarations that covered
earlier declarations.

Signed-off-by: Stephen Hemminger <[email-masked]>

--- a/net/ipv4/fib_trie.c	2007-07-27 08:41:46.000000000 +0100
+++ b/net/ipv4/fib_trie.c	2007-07-27 08:47:05.000000000 +0100
@@ -651,7 +651,6 @@ static struct node *resize(struct trie *
 
 static struct tnode *inflate(struct trie *t, struct tnode *tn)
 {
-	struct tnode *inode;
 	struct tnode *oldtnode = tn;
 	int olen = tnode_child_length(tn);
 	int i;
@@ -700,7 +699,7 @@ static struct tnode *inflate(struct trie
 
 	for (i = 0; i < olen; i++) {
 		struct node *node = tnode_get_child(oldtnode, i);
-		struct tnode *left, *right;
+		struct tnode *left, *right, *inode;
 		int size, j;
 
 		/* An empty child */
@@ -1049,7 +1048,7 @@ fib_insert_node(struct trie *t, int *err
 	/* Case 1: n is a leaf. Compare prefixes */
 
 	if (n != NULL && IS_LEAF(n) && tkey_equals(key, n->key)) {
-		struct leaf *l = (struct leaf *) n;
+		struct leaf *nl = (struct leaf *) n;
 
 		li = leaf_info_new(plen);
 
@@ -1059,7 +1058,7 @@ fib_insert_node(struct trie *t, int *err
 		}
 
 		fa_head = &li->falh;
-		insert_leaf_info(&l->list, li);
+		insert_leaf_info(&nl->list, li);
 		goto done;
 	}
 	t->size++;

--