volscan: avoid printing null mount-point cellname

[openafs.git] / src / vol / vol-info.c

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index c1fe3db..8ba8c7a 100644 (file)
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -2116,7 +2116,7 @@ ModeMaskMatch(unsigned int modeBits)
 {
     int i;
 
-    for (i = 0; ModeMask[i] && i <= sizeof(ModeMask) / sizeof(*ModeMask); i++) {
+    for (i = 0; i < sizeof(ModeMask) / sizeof(*ModeMask) && ModeMask[i]; i++) {
        if ((ModeMask[i] & modeBits) == 0) {
            return 0;           /* at least one mode bit is not present */
        }
@@ -2495,7 +2495,7 @@ PrintColumns(struct VnodeDetails *vdp, const char *desc)
            break;
        case col_mcell:
            printf("%s",
-                  (vdp->t == VNODE_U_MOUNT ? vdp->u.mnt.cell : PLACEHOLDER));
+                  (vdp->t == VNODE_U_MOUNT && vdp->u.mnt.cell ? vdp->u.mnt.cell : PLACEHOLDER));
            break;
        case col_mvol:
            printf("%s",