diff options
| author | Karel Zak | 2016-06-14 13:55:27 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-06-14 13:55:27 +0200 |
| commit | 372d410d9e2ffd300cc7e264646c6cdd70e022a6 (patch) | |
| tree | 791bef894c1762b94276533298b8afa8ef809441 /libmount/src | |
| parent | chfn: chsh: use selinux_check_passwd_access() (diff) | |
| download | kernel-qcow2-util-linux-372d410d9e2ffd300cc7e264646c6cdd70e022a6.tar.gz kernel-qcow2-util-linux-372d410d9e2ffd300cc7e264646c6cdd70e022a6.tar.xz kernel-qcow2-util-linux-372d410d9e2ffd300cc7e264646c6cdd70e022a6.zip | |
libmount: don't check nonnull attributes for NULL [-Wnonnull-compare]
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src')
| -rw-r--r-- | libmount/src/context.c | 2 | ||||
| -rw-r--r-- | libmount/src/context_loopdev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c index c53a63954..87ccccfc6 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -369,7 +369,7 @@ int mnt_context_disable_canonicalize(struct libmnt_context *cxt, int disable) */ int mnt_context_is_nocanonicalize(struct libmnt_context *cxt) { - return cxt && (cxt->flags & MNT_FL_NOCANONICALIZE) ? 1 : 0; + return cxt->flags & MNT_FL_NOCANONICALIZE ? 1 : 0; } /** diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c index 97435619e..836ebc1d3 100644 --- a/libmount/src/context_loopdev.c +++ b/libmount/src/context_loopdev.c @@ -93,7 +93,7 @@ is_mounted_same_loopfile(struct libmnt_context *cxt, assert(cxt->fs); assert((cxt->flags & MNT_FL_MOUNTFLAGS_MERGED)); - if (!target || !backing_file || mnt_context_get_mtab(cxt, &tb)) + if (mnt_context_get_mtab(cxt, &tb)) return 0; DBG(LOOP, ul_debugobj(cxt, "checking if %s mounted on %s", |