libmount: fix use of logical '&&' with constant operand

Found by clang.

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>

diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c
index 6ed0df13e4039d535e0905d0b406ade5d439cefb..992472e3d867d24d4ce22ef55b1a9c0c1aa5756e 100644 (file)
--- a/libmount/src/context_loopdev.c
+++ b/libmount/src/context_loopdev.c
@@ -52,7 +52,7 @@ int mnt_context_is_loopdev(struct libmnt_context *cxt)
        type = mnt_fs_get_fstype(cxt->fs);
        fl = __mnt_fs_get_flags(cxt->fs);
 
-       if (!(fl && (MNT_FS_PSEUDO | MNT_FS_NET | MNT_FS_SWAP)) &&
+       if (!(fl & (MNT_FS_PSEUDO | MNT_FS_NET | MNT_FS_SWAP)) &&
            (!type || strcmp(type, "auto") == 0 || blkid_known_fstype(type))) {
                struct stat st;
 

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 7e75ad7363de99c543c41eaa54fc131cd88390f4..bcc4cdd12012bb4984a285b25003565808b650ef 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -125,7 +125,7 @@ static int fix_optstr(struct libmnt_context *cxt)
                        goto done;
        }
 
-       if (!rc && cxt->user_mountflags && MNT_MS_USER)
+       if (!rc && cxt->user_mountflags & MNT_MS_USER)
                rc = mnt_optstr_fix_user(&fs->user_optstr);
 
        /* refresh merged optstr */