diff options
| author | Sami Kerola | 2013-04-08 21:32:50 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-09 12:19:25 +0200 |
| commit | c9f63764dcc3880201d11489a655f6d4be92f641 (patch) | |
| tree | 01d92015188597ba1e5d634bcbe88663ebc3ebc9 /libmount/src/tab.c | |
| parent | various: fix variable and function declarations [smatch scan] (diff) | |
| download | kernel-qcow2-util-linux-c9f63764dcc3880201d11489a655f6d4be92f641.tar.gz kernel-qcow2-util-linux-c9f63764dcc3880201d11489a655f6d4be92f641.tar.xz kernel-qcow2-util-linux-c9f63764dcc3880201d11489a655f6d4be92f641.zip | |
various: fix shadow declarations [smatch scan]
libmount/src/tab.c:990:34: warning: symbol 'fs' shadows an earlier one
libmount/src/tab.c:970:26: originally declared here
misc-utils/findmnt.c:492:30: warning: symbol 'tmp' shadows an earlier one
misc-utils/findmnt.c:473:14: originally declared here
fdisks/fdiskdoslabel.c:211:36: warning: symbol 'pe' shadows an earlier one
fdisks/fdiskdoslabel.c:180:20: originally declared here
fdisks/fdiskdoslabel.c:639:34: warning: symbol 'i' shadows an earlier one
fdisks/fdiskdoslabel.c:578:16: originally declared here
fdisks/fdiskdoslabel.c:947:21: warning: symbol 'i' shadows an earlier one
fdisks/fdiskdoslabel.c:924:16: originally declared here
fdisks/fdiskdoslabel.c:976:29: warning: symbol 'i' shadows an earlier one
fdisks/fdiskdoslabel.c:924:16: originally declared here
fdisks/fdiskdoslabel.c:984:29: warning: symbol 'i' shadows an earlier one
fdisks/fdiskdoslabel.c:924:16: originally declared here
[kzak@redhat.com: - don't use local 'tmp' in findmnt.c]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/tab.c')
| -rw-r--r-- | libmount/src/tab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 9d524c1c1..11a297814 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -987,15 +987,15 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) if (is_mountinfo(tb)) { /* @tb is mountinfo, so we can try to use fs-roots */ - struct libmnt_fs *fs; + struct libmnt_fs *rootfs; int flags = 0; if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0) flags = MS_BIND; - fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root); - if (fs) - src = mnt_fs_get_srcpath(fs); + rootfs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root); + if (rootfs) + src = mnt_fs_get_srcpath(rootfs); } if (!src) |