From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 21 Jul 2014 15:01:04 +0000 (-0400)
Subject: Avoid a name conflict in a local variable
X-Git-Tag: upstream/1.8.0_pre1^2~616
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=59e9b3b409be73dfd004077b634958abcd79b91d;p=packages%2Fo%2Fopenafs.git

Avoid a name conflict in a local variable

Modern compilers will warn when a variable in a nested scope hiding
a variable of the same name in an outer scope.  One of the arguments
to afs_lhash_remove() is already named 'data'; don't reuse that name
for a local variable.

Change-Id: Icbb5010d298110cd4dab395fc5eec45e01ec9ba3
Reviewed-on: http://gerrit.openafs.org/11371
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c
index 18d7a1afd..176fd246a 100644
--- a/src/util/afs_lhash.c
+++ b/src/util/afs_lhash.c
@@ -406,7 +406,7 @@ afs_lhash_remove(afs_lhash * lh, unsigned key, const void *data)
 	 pprev = &cur->next, cur = cur->next) {
 	lh->remove_tests++;
 	if (lh->equal(data, cur->data)) {
-	    void *data = cur->data;
+	    void *ptr = cur->data;
 
 	    if (pprev) {
 		*pprev = cur->next;
@@ -418,7 +418,7 @@ afs_lhash_remove(afs_lhash * lh, unsigned key, const void *data)
 
 	    lh->ndata--;
 
-	    return data;
+	    return ptr;
 	}
     }