summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorSami Kerola2019-02-09 09:47:43 +0100
committerKarel Zak2019-02-18 13:20:34 +0100
commit123eb9ef8cb8dea88a57d86681524e78fdb5e104 (patch)
tree70ab03aa85fa90ce6e6867f11e8b601fc6c20e1b /misc-utils
parentvarious: fix 'uninitialized when used' warnings [clang] (diff)
downloadkernel-qcow2-util-linux-123eb9ef8cb8dea88a57d86681524e78fdb5e104.tar.gz
kernel-qcow2-util-linux-123eb9ef8cb8dea88a57d86681524e78fdb5e104.tar.xz
kernel-qcow2-util-linux-123eb9ef8cb8dea88a57d86681524e78fdb5e104.zip
hardlink, wall: fix variable shadowing
misc-utils/hardlink.c:91:65: warning: declaration shadows a variable in the global scope [-Wshadow] misc-utils/hardlink.c:73:5: note: previous declaration is here int content_only = 0; term-utils/wall.c:114:40: warning: declaration shadows a variable in the global scope [-Wshadow] term-utils/wall.c:129:65: warning: declaration shadows a variable in the global scope [-Wshadow] /usr/include/bits/getopt_core.h:36:14: note: previous declaration is here extern char *optarg; Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/hardlink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c
index 1558573f7..f7cfc961b 100644
--- a/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@ -100,9 +100,9 @@ static inline unsigned int hash(off_t size, time_t mtime)
}
__attribute__ ((always_inline))
-static inline int stcmp(struct stat *st1, struct stat *st2, int content_only)
+static inline int stcmp(struct stat *st1, struct stat *st2, int content_scope)
{
- if (content_only)
+ if (content_scope)
return st1->st_size != st2->st_size;
return st1->st_mode != st2->st_mode