budb: Simplify scanHashTableBlock

We don't need to maintain two copies (entryAddr and nextEntryAddr)
of the entry address - rework the while loop so we just use one,
and make clang a little happier

Caught by clang-analyzer

Change-Id: I6f5d76e114ad09a4fd3fc36b4d64f63daa9e1e78
Reviewed-on: http://gerrit.openafs.org/9251
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c
index 59a984a7da01969c98b575aa84501f24eb1ce8b7..e51d7a35e3b6c0035f25a310d19d2acfa0edc916 100644 (file)
--- a/src/budb/db_hash.c
+++ b/src/budb/db_hash.c
@@ -1107,7 +1107,7 @@ scanHashTableBlock(struct ubik_trans *ut,
     int entrySize;             /* hashed entry size */
 
     char entry[sizeof(struct block)];
-    dbadr entryAddr, nextEntryAddr;
+    dbadr entryAddr;
 
     int i;
 
@@ -1119,19 +1119,17 @@ scanHashTableBlock(struct ubik_trans *ut,
      */
 
     for (i = 0; (i < nHTBuckets) && (index < length); i++, index++) {  /*f */
-       entryAddr = 0;
-       nextEntryAddr = ntohl(htBlockPtr->bucket[i]);
+       entryAddr = ntohl(htBlockPtr->bucket[i]);
 
        /* if this is the old hash table, all entries below the progress mark
         * should have been moved to the new hash table
         */
-       if (old && (index < mhtPtr->progress) && nextEntryAddr)
+       if (old && (index < mhtPtr->progress) && entryAddr)
            return BUDB_INTERNALERROR;
 
        /* now walk down the chain of each bucket */
-       while (nextEntryAddr) { /*w */
+       while (entryAddr) {     /*w */
 
-           entryAddr = nextEntryAddr;
            if (dbread(ut, entryAddr, &entry[0], entrySize))
                return (BUDB_INTERNALERROR);
 
@@ -1139,7 +1137,7 @@ scanHashTableBlock(struct ubik_trans *ut,
                (*operationFn) (entryAddr, &entry[0], rockPtr);
            }
 
-           nextEntryAddr =
+           entryAddr =
                ntohl(*((dbadr *) (entry + mhtPtr->threadOffset)));
        }                       /*w */