From: Pat Riehecky <riehecky@fnal.gov>
Date: Fri, 1 Jun 2018 21:33:37 +0000 (-0500)
Subject: Fix static expressions in conditionals
X-Git-Tag: openafs-devel-1_9_0~306
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=5cd5cd9fa8754a5af346fa6a392363b046316c75

Fix static expressions in conditionals

The conditions in these if statements are always true (or always false).
Remove the check in cmdebug.c, as it is unnecessary, and fix the check
in vlclient.c to actually check for a valid voltype. (via cppcheck)

Change-Id: Ica7dfc9b81fe8bd0f156f6e4e616ed45e205985a
Reviewed-on: https://gerrit.openafs.org/13158
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---

diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c
index a5596e7..bb1c953 100644
--- a/src/venus/cmdebug.c
+++ b/src/venus/cmdebug.c
@@ -569,8 +569,8 @@ CommandProc(struct cmd_syndesc *as, void *arock)
 
     if (int32p == 0 || int32p == 1)
         PrintLocks(conn, int32p);
-    if (int32p >= 0 || int32p <= 4)
-        PrintCacheEntries(conn, int32p);
+
+    PrintCacheEntries(conn, int32p);
     return 0;
 }
 
diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index e22af50..8c5044c 100644
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -687,7 +687,7 @@ handleit(struct cmd_syndesc *as, void *arock)
 		sscanf(&(*argp)[0], "%d", &id);
 		++argp, --nargs;
 		sscanf(&(*argp)[0], "%d", &voltype);
-		if (voltype < 0 && voltype > 2) {
+		if (voltype < 0 || voltype > 2) {
 		    printf("Illegal voltype; must be 0, 1 or 2\n");
 		    continue;
 		}