clang-10: use AFS_FALLTHROUGH for case fallthrough

[openafs.git] / src / vol / salvsync-server.c

diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index 5cfdd9f..fbbc70b 100644 (file)
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -115,7 +115,6 @@ static afs_int32 SALVSYNC_com_CancelAll(SALVSYNC_command * com, SALVSYNC_respons
 static afs_int32 SALVSYNC_com_Link(SALVSYNC_command * com, SALVSYNC_response * res);
 
 
-extern int LogLevel;
 extern int VInit;
 extern pthread_mutex_t vol_salvsync_mutex;
 
@@ -182,7 +181,7 @@ static void (*HandlerProc[MAXHANDLERS]) (int);
 static struct QueueHead  SalvageHashTable[VSHASH_SIZE];
 
 static struct SalvageQueueNode *
-LookupNode(afs_uint32 vid, char * partName,
+LookupNode(VolumeId vid, char * partName,
           struct SalvageQueueNode ** parent)
 {
     struct rx_queue *qp, *nqp;
@@ -233,21 +232,6 @@ AddNodeToHash(struct SalvageQueueNode * node)
     SalvageHashTable[idx].len++;
 }
 
-#if 0
-static void
-DeleteNodeFromHash(struct SalvageQueueNode * node)
-{
-    int idx = VSHASH(node->command.sop.volume);
-
-    if (queue_IsNotOnQueue(&node->hash_chain)) {
-       return;
-    }
-
-    queue_Remove(&node->hash_chain);
-    SalvageHashTable[idx].len--;
-}
-#endif
-
 void
 SALVSYNC_salvInit(void)
 {
@@ -337,7 +321,7 @@ SALVSYNC_syncThread(void * args)
            CallHandler(&SALVSYNC_readfds);
     }
 
-    return NULL;
+    AFS_UNREACHED(return(NULL));
 }
 
 static void
@@ -833,7 +817,7 @@ FindHandler(osi_socket afd)
        }
     ReleaseReadLock(&SALVSYNC_handler_lock);   /* just in case */
     osi_Panic("Failed to find handler\n");
-    return -1;                 /* satisfy compiler */
+    AFS_UNREACHED(return -1);
 }
 
 static int
@@ -845,7 +829,7 @@ FindHandler_r(osi_socket afd)
            return i;
        }
     osi_Panic("Failed to find handler\n");
-    return -1;                 /* satisfy compiler */
+    AFS_UNREACHED(return -1);
 }
 
 static int
@@ -956,7 +940,7 @@ LinkNode(struct SalvageQueueNode * parent,
     switch (clone->state) {
     case SALVSYNC_STATE_QUEUED:
        DeleteFromSalvageQueue(clone);
-
+       AFS_FALLTHROUGH;
     case SALVSYNC_STATE_SALVAGING:
        switch (parent->state) {
        case SALVSYNC_STATE_UNKNOWN:
@@ -1086,25 +1070,6 @@ DeleteFromPendingQueue(struct SalvageQueueNode * node)
     }
 }
 
-#if 0
-static struct SalvageQueueNode *
-LookupPendingCommand(SALVSYNC_command_hdr * qry)
-{
-    struct SalvageQueueNode * np, * nnp;
-
-    for (queue_Scan(&pendingQueue, np, nnp, SalvageQueueNode)) {
-       if ((np->command.sop.volume == qry->volume) &&
-           !strncmp(np->command.sop.partName, qry->partName,
-                    sizeof(qry->partName)))
-           break;
-    }
-
-    if (queue_IsEnd(&pendingQueue, np))
-       np = NULL;
-    return np;
-}
-#endif
-
 static struct SalvageQueueNode *
 LookupPendingCommandByPid(int pid)
 {
@@ -1315,7 +1280,7 @@ SALVSYNC_doneWorkByPid(int pid, int status)
 {
     struct SalvageQueueNode * node;
     char partName[16];
-    afs_uint32 volids[VOLMAXTYPES+1];
+    VolumeId volids[VOLMAXTYPES+1];
     unsigned int idx;
 
     memset(volids, 0, sizeof(volids));