vol: Don't assume enum is an int

The type that an enum is promoted to for arithmetic is compiler
dependent. We can't assume that it's an int, or a short.

Explicitly cast the volume state enum where clang gets upset.

Change-Id: Iab285d3a04dac698797ab0df2337aee75e3876b2
Reviewed-on: http://gerrit.openafs.org/9137
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/vol/vnode_inline.h b/src/vol/vnode_inline.h
index 67ccb6b521c8c86ba53113fa4fc33b04ba73d69d..a314ab79b49fe0bf10d3302e449df7c9b1f6698a 100644 (file)
--- a/src/vol/vnode_inline.h
+++ b/src/vol/vnode_inline.h
@@ -236,7 +236,7 @@ VnIsErrorState(VnState state)
 static_inline int
 VnIsValidState(VnState state)
 {
-    if ((state >= 0) &&
+    if (((int) state >= 0) &&
        (state < VN_STATE_COUNT)) {
        return 1;
     }

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 384f6de217ecbbe049dbeafe3dc9124975b74fd2..39a3aa15a2bac58f8c8f449895b24d99acd766ef 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -1848,9 +1848,9 @@ VShutdownVolume_r(Volume * vp)
     VCreateReservation_r(vp);
 
     if (LogLevel >= 5) {
-       Log("VShutdownVolume_r:  vid=%" AFS_VOLID_FMT ", device=%d, state=%hu\n",
+       Log("VShutdownVolume_r:  vid=%" AFS_VOLID_FMT ", device=%d, state=%u\n",
            afs_printable_VolumeId_lu(vp->hashid), vp->partition->device,
-           V_attachState(vp));
+           (unsigned int) V_attachState(vp));
     }
 
     /* wait for other blocking ops to finish */

diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index 1fc885556b912033b127f71af8edf8ae53e0ea68..7b3b831c2d39c2d90e3cf35aad336e9fce463a6e 100644 (file)
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -424,7 +424,7 @@ VIsOfflineState(VolState state)
 static_inline int
 VIsValidState(VolState state)
 {
-    if ((state >= 0) &&
+    if (((int) state >= 0) &&
        (state < VOL_STATE_COUNT)) {
        return 1;
     }