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 90c2d775724e2a483a10d50e9499ae0f0e21876b..a4a61cf89905a822ccdc1805f65e60f7b5a58b85 100644 (file)
--- 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 2222585f8b066577c4ee8ecd90b3a154a8c02c55..b9e67a1ba3cc78d74c8ca7aec20f7b51de1d8119 100644 (file)
--- 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 481db6d3eea7ca50d35410e621bfe833fae6b6d7..5f1e2bda7767a07cba649c3e11f5a1e160eab164 100644 (file)
--- 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;