summaryrefslogtreecommitdiffstats
path: root/misc-utils/findmnt.c
diff options
context:
space:
mode:
authorSami Kerola2015-01-01 00:01:21 +0100
committerKarel Zak2015-01-07 10:08:21 +0100
commit7ee26cbf025d915c6c15e2fe877ee92846f5992f (patch)
tree532aa9b7a7f9807a0249830062ac26abd3d682b6 /misc-utils/findmnt.c
parentfallocate: create mode 0666, that's what umask is for (diff)
downloadkernel-qcow2-util-linux-7ee26cbf025d915c6c15e2fe877ee92846f5992f.tar.gz
kernel-qcow2-util-linux-7ee26cbf025d915c6c15e2fe877ee92846f5992f.tar.xz
kernel-qcow2-util-linux-7ee26cbf025d915c6c15e2fe877ee92846f5992f.zip
maint: fix shadow declaration
This change fixes all shadow declarations. The worth while to mention fix is with libfdisk sun geometry. It comes from bitops.h cpu_to_be16 macro that further expands from include/bits/byteswap.h that has the shadowing. libfdisk/src/sun.c:961:173: warning: declaration of '__v' shadows a previous local [-Wshadow] libfdisk/src/sun.c:961:69: warning: shadowed declaration is here [-Wshadow] libfdisk/src/sun.c:961:178: warning: declaration of '__x' shadows a previous local [-Wshadow] libfdisk/src/sun.c:961:74: warning: shadowed declaration is here [-Wshadow] That could have caused earlier some unexpected results. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils/findmnt.c')
-rw-r--r--misc-utils/findmnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 153ea453a..9d1f298af 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -856,7 +856,7 @@ static struct libmnt_table *parse_tabfiles(char **files,
* Parses mountinfo and calls mnt_cache_set_targets(cache, mtab). Only
* necessary if @tb in main() was read from a non-kernel source.
*/
-static void cache_set_targets(struct libmnt_cache *cache)
+static void cache_set_targets(struct libmnt_cache *tmp)
{
struct libmnt_table *tb;
const char *path;
@@ -870,7 +870,7 @@ static void cache_set_targets(struct libmnt_cache *cache)
_PATH_PROC_MOUNTS;
if (mnt_table_parse_file(tb, path) == 0)
- mnt_cache_set_targets(cache, tb);
+ mnt_cache_set_targets(tmp, tb);
mnt_unref_table(tb);
}