summaryrefslogtreecommitdiffstats
path: root/libmount/src/tab.c
diff options
context:
space:
mode:
authorSami Kerola2015-08-17 19:44:28 +0200
committerKarel Zak2015-08-24 10:55:37 +0200
commit624e147ba29531b16edeaad21f67b7bc6e9e6b3e (patch)
tree124d36e8db6789af487c7dac5d8f7221ebade62a /libmount/src/tab.c
parentchfn: document CHFN_RESTRICT /etc/login.defs (diff)
downloadkernel-qcow2-util-linux-624e147ba29531b16edeaad21f67b7bc6e9e6b3e.tar.gz
kernel-qcow2-util-linux-624e147ba29531b16edeaad21f67b7bc6e9e6b3e.tar.xz
kernel-qcow2-util-linux-624e147ba29531b16edeaad21f67b7bc6e9e6b3e.zip
misc: fix shadow declarations
sys-utils/zramctl.c: In function 'get_mm_stat': sys-utils/zramctl.c:276:58: warning: declaration of 'inbytes' shadows a global declaration [-Wshadow] static char *get_mm_stat(struct zram *z, size_t idx, int inbytes) sys-utils/zramctl.c:119:39: note: shadowed declaration is here static unsigned int raw, no_headings, inbytes; libmount/src/tab.c: In function 'mnt_table_get_fs_root': libmount/src/tab.c:1221:22: warning: declaration of 'fs' shadows a parameter [-Wshadow] struct libmnt_fs *fs = mnt_table_find_mountpoint(tb, libmount/src/tab.c:1197:24: note: shadowed declaration is here struct libmnt_fs *fs, disk-utils/fsck.minix.c: In function 'main': disk-utils/fsck.minix.c:1364:17: warning: declaration of 'i' shadows a previous local [-Wshadow] unsigned long i, free; disk-utils/fsck.minix.c:1250:6: note: shadowed declaration is here int i; Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'libmount/src/tab.c')
-rw-r--r--libmount/src/tab.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index d616547c8..0df8d496d 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1218,10 +1218,10 @@ struct libmnt_fs *mnt_table_get_fs_root(struct libmnt_table *tb,
src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fs), tb->cache);
if (src) {
- struct libmnt_fs *fs = mnt_table_find_mountpoint(tb,
+ struct libmnt_fs *f = mnt_table_find_mountpoint(tb,
src, MNT_ITER_BACKWARD);
- if (fs)
- mnt = mnt_fs_get_target(fs);
+ if (f)
+ mnt = mnt_fs_get_target(f);
}
if (mnt)