budb: fix signedness of hash address logging

[openafs.git] / src / budb / db_hash.c

diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c
index 59a984a..445a1a1 100644 (file)
--- a/src/budb/db_hash.c
+++ b/src/budb/db_hash.c
@@ -547,22 +547,22 @@ ht_HashEntry(struct memoryHashTable *mht,
     switch (type) {
     case HT_dumpIden_FUNCTION:
        retval = IdHashFunction(ntohl(((struct dump *)e)->id));
-       LogDebug(5, "HashEntry: dumpid returns %d\n", retval);
+       LogDebug(5, "HashEntry: dumpid returns %u\n", retval);
        break;
 
     case HT_dumpName_FUNCTION:
        retval = StringHashFunction((unsigned char *)((struct dump *)e)->dumpName);
-       LogDebug(5, "HashEntry: dumpname returns %d\n", retval);
+       LogDebug(5, "HashEntry: dumpname returns %u\n", retval);
        break;
 
     case HT_tapeName_FUNCTION:
        retval = StringHashFunction((unsigned char *)((struct tape *)e)->name);
-       LogDebug(5, "HashEntry: tapename returns %d\n", retval);
+       LogDebug(5, "HashEntry: tapename returns %u\n", retval);
        break;
 
     case HT_volName_FUNCTION:
        retval = StringHashFunction((unsigned char *)((struct volInfo *)e)->name);
-       LogDebug(5, "HashEntry: volname returns %d\n", retval);
+       LogDebug(5, "HashEntry: volname returns %u\n", retval);
        break;
 
     default:
@@ -722,7 +722,7 @@ ht_HashInList(struct ubik_trans *ut, struct memoryHashTable *mht,
 
     for (ea = listA; ea; ea = next_ea) {       /*f */
 
-       LogDebug(3, "ht_HashInList: move entry at %d, type %d\n", ea,
+       LogDebug(3, "ht_HashInList: move entry at %u, type %d\n", ea,
                 ntohl(mht->ht->functionType));
 
        if (dbread(ut, ea, e, e_size))
@@ -749,7 +749,7 @@ ht_HashInList(struct ubik_trans *ut, struct memoryHashTable *mht,
 
            /* get the hash value */
            hash = ht_HashEntry(mht, e) % mht->length;
-           LogDebug(4, "ht_HashInList: moved to %d\n", hash);
+           LogDebug(4, "ht_HashInList: moved to %u\n", hash);
 
            /* get the new hash table block */
            code = ht_GetTableBlock(ut, mht, hash, 0 /*old */ , &block, &bo);
@@ -934,7 +934,7 @@ ht_HashIn(struct ubik_trans *ut,
     code = set_word_offset(ut, ea, e, mht->threadOffset, block->b.bucket[bo]);
     if (code)
        return BUDB_IO;
-    LogDebug(5, "Hashin: set %d to %d\n", mht->threadOffset,
+    LogDebug(5, "Hashin: set %d to %u\n", mht->threadOffset,
             block->b.bucket[bo]);
 
     code =
@@ -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 */