From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 25 Jul 2012 19:15:33 +0000 (+0200)
Subject: hexdump: fix shadow declaration
X-Git-Tag: v2.22-rc1~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89a13b46bd1a0c8aa5c1dbbc6ed3d669c1448274;p=thirdparty%2Futil-linux.git

hexdump: fix shadow declaration

text-utils/hexdump.h:84:5: warning: shadowed declaration is here [-Wshadow]
./include/xalloc.h:23:28: warning: declaration of 'size' shadows a global declaration [-Wshadow]
./include/xalloc.h:33:40: warning: declaration of 'size' shadows a global declaration [-Wshadow]
./include/xalloc.h:43:49: warning: declaration of 'size' shadows a global declaration [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 90c2d77572..a4a61cf899 100644
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 
 	/* figure out the data block size */
 	for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {
-		tfs->bcnt = size(tfs);
+		tfs->bcnt = block_size(tfs);
 		if (blocksize < tfs->bcnt)
 			blocksize = tfs->bcnt;
 	}
diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
index 2222585f8b..b9e67a1ba3 100644
--- a/text-utils/hexdump.h
+++ b/text-utils/hexdump.h
@@ -81,7 +81,7 @@ extern off_t skip;                      /* bytes to skip */
 enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
 extern enum _vflag vflag;
 
-int size(FS *);
+int block_size(FS *);
 void add(const char *);
 void rewrite(FS *);
 void addfile(char *);
diff --git a/text-utils/parse.c b/text-utils/parse.c
index 481db6d3ee..5f1e2bda77 100644
--- a/text-utils/parse.c
+++ b/text-utils/parse.c
@@ -150,7 +150,7 @@ void add(const char *fmt)
 
 static const char *spec = ".#-+ 0123456789";
 
-int size(FS *fs)
+int block_size(FS *fs)
 {
 	FU *fu;
 	int bcnt, cursize;