libblkid/whereis: simplify some conditions [cppcheck]

[misc-utils/whereis.c:466]: (style) Redundant condition: uflag.
'A && (!A || B)' is equivalent to 'A || B'
[libblkid/src/tag.c:373]: (style) Redundant condition: dev.
'A && (!A || B)' is equivalent to 'A || B'

Signed-off-by: Boris Egorov <egorov@linux.com>

diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c
index 6af806251008cc47b36cdb36b3424a1e7a89e005..281612a7a90e83bb6b690d7f243d1c5ee5ec7b21 100644 (file)
--- a/libblkid/src/tag.c
+++ b/libblkid/src/tag.c
@@ -370,7 +370,7 @@ try_again:
        }
        if (dev && !(dev->bid_flags & BLKID_BID_FL_VERIFIED)) {
                dev = blkid_verify(cache, dev);
-               if (!dev || (dev && (dev->bid_flags & BLKID_BID_FL_VERIFIED)))
+               if (!dev || dev->bid_flags & BLKID_BID_FL_VERIFIED)
                        goto try_again;
        }
 

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 96a930e602acc0c4f371a5a7a9b956369e71d712..697d66626d8ae1bebdb69754a61b4e011b38dfd3 100644 (file)
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -463,7 +463,7 @@ static void lookup(const char *pattern, struct wh_dirlist *ls, int want)
 
        free(wait);
 
-       if (!uflag || (uflag && count > 1))
+       if (!uflag || count > 1)
                putchar('\n');
        return;
 }