[Sheepdog] [PATCH 12/12] shadow problem: attr() is shadowed by its parameter

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Fri May 21 13:42:39 CEST 2010


Rename a parameter attr to name.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 sheep/store.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sheep/store.c b/sheep/store.c
index fac6d03..f2beb9a 100644
--- a/sheep/store.c
+++ b/sheep/store.c
@@ -1597,7 +1597,7 @@ again:
 }
 
 
-static int attr(char *path, const char *attr, void *var, int len, int set)
+static int attr(char *path, const char *name, void *var, int len, int set)
 {
 	int ret, fd;
 
@@ -1606,15 +1606,15 @@ static int attr(char *path, const char *attr, void *var, int len, int set)
 		return SD_RES_EIO;
 
 	if (set)
-		ret = fsetxattr(fd, attr, var, len, 0);
+		ret = fsetxattr(fd, name, var, len, 0);
 	else
-		ret = fgetxattr(fd, attr, var, len);
+		ret = fgetxattr(fd, name, var, len);
 
 	close(fd);
 
 	if (set) {
 		if (ret) {
-			eprintf("use 'user_xattr' option?, %s\n", attr);
+			eprintf("use 'user_xattr' option?, %s\n", name);
 			return SD_RES_SYSTEM_ERROR;
 		}
 	} else {
-- 
1.5.6.5




More information about the sheepdog mailing list