Rename printf cast helpers and clean up format string warnings

Some confusion had ensued about the usage of our printf cast helper
functions. Rename these to attempt to allay that confusion, and restore
the functions themselves to their original definitions.

Essentially, afs_printable_int32_ld() and friends are helpers to go
from afs specifc types to things that can be emitted by printf without
causing compiler warnings.

Also clean up some additional warnings from type mismatches between
escapes in printf format strings and the variables being printed.

Reviewed-on: http://gerrit.openafs.org/50
Verified-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Russ Allbery <rra@stanford.edu>

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 466607c94438c6ad487e64bb35ecfec3febfdbe7..01ec233785c65231f6a94c503a720fed69e172f1 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -1686,8 +1686,8 @@ ktc_newpag(void)
        sprintf(fname, "%s%d", prefix, getuid());
        sprintf(fname5, "%s%d", prefix5, getuid());
     } else {
-       sprintf(fname, "%sp%lu", prefix, afs_cast_uint32(pag));
-       sprintf(fname5, "%sp%lud", prefix5, (long unsigned int) pag);
+       sprintf(fname, "%sp%lu", prefix, afs_printable_uint32_lu(pag));
+       sprintf(fname5, "%sp%lud", prefix5, afs_printable_uint32_lu(pag));
     }
     ktc_set_tkt_string(fname);
 

diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index b3cd612493b4176ec0699d1c6bfdb4d1e34d2483..ddcc8662a62d11359780c515abd720608fc3c3c5 100644 (file)
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -700,15 +700,15 @@ SendNotifierData(register int fd, register struct bnode_proc *tp)
        buf1 = "(null)";
     (void)sprintf(bufp, "coreName: %s\n", buf1);
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "pid: %ld\n", afs_cast_int32(tp->pid));
+    (void)sprintf(bufp, "pid: %ld\n", afs_printable_int32_ld(tp->pid));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "lastExit: %ld\n", afs_cast_int32(tp->lastExit));
+    (void)sprintf(bufp, "lastExit: %ld\n", afs_printable_int32_ld(tp->lastExit));
     bufp += strlen(bufp);
 #ifdef notdef
-    (void)sprintf(bufp, "lastSignal: %ld\n", afs_cast_int32(tp->lastSignal));
+    (void)sprintf(bufp, "lastSignal: %ld\n", afs_printable_int32_ld(tp->lastSignal));
     bufp += strlen(bufp);
 #endif
-    (void)sprintf(bufp, "flags: %ld\n", afs_cast_int32(tp->flags));
+    (void)sprintf(bufp, "flags: %ld\n", afs_printable_int32_ld(tp->flags));
     bufp += strlen(bufp);
     (void)sprintf(bufp, "END bnode_proc\n");
     bufp += strlen(bufp);
@@ -725,21 +725,21 @@ SendNotifierData(register int fd, register struct bnode_proc *tp)
     bufp += strlen(bufp);
     (void)sprintf(bufp, "name: %s\n", tb->name);
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "rsTime: %ld\n", afs_cast_int32(tb->rsTime));
+    (void)sprintf(bufp, "rsTime: %ld\n", afs_printable_int32_ld(tb->rsTime));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "rsCount: %ld\n", afs_cast_int32(tb->rsCount));
+    (void)sprintf(bufp, "rsCount: %ld\n", afs_printable_int32_ld(tb->rsCount));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "procStartTime: %ld\n", afs_cast_int32(tb->procStartTime));
+    (void)sprintf(bufp, "procStartTime: %ld\n", afs_printable_int32_ld(tb->procStartTime));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "procStarts: %ld\n", afs_cast_int32(tb->procStarts));
+    (void)sprintf(bufp, "procStarts: %ld\n", afs_printable_int32_ld(tb->procStarts));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "lastAnyExit: %ld\n", afs_cast_int32(tb->lastAnyExit));
+    (void)sprintf(bufp, "lastAnyExit: %ld\n", afs_printable_int32_ld(tb->lastAnyExit));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "lastErrorExit: %ld\n", afs_cast_int32(tb->lastErrorExit));
+    (void)sprintf(bufp, "lastErrorExit: %ld\n", afs_printable_int32_ld(tb->lastErrorExit));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "errorCode: %ld\n", afs_cast_int32(tb->errorCode));
+    (void)sprintf(bufp, "errorCode: %ld\n", afs_printable_int32_ld(tb->errorCode));
     bufp += strlen(bufp);
-    (void)sprintf(bufp, "errorSignal: %ld\n", afs_cast_int32(tb->errorSignal));
+    (void)sprintf(bufp, "errorSignal: %ld\n", afs_printable_int32_ld(tb->errorSignal));
     bufp += strlen(bufp);
 /*
     (void) sprintf(bufp, "lastErrorName: %s\n", tb->lastErrorName);

diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index c7aa408b884b6173d8a0aae13599aebd85db5729..fc4bceba6476f691bf0db766b808c7e8e56fe8eb 100644 (file)
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -1355,14 +1355,14 @@ DoSalvage(struct rx_connection * aconn, char * aparm1, char * aparm2,
        if (mrafsParm->OptDontAskFS)
            strcat(tbuffer, " -DontAskFS");
        if (mrafsParm->OptLogLevel) {
-           sprintf(pbuffer, " -LogLevel %ld", afs_cast_int32(mrafsParm->OptLogLevel));
+           sprintf(pbuffer, " -LogLevel %ld", afs_printable_int32_ld(mrafsParm->OptLogLevel));
            strcat(tbuffer, pbuffer);
        }
        if (mrafsParm->OptRxDebug)
            strcat(tbuffer, " -rxdebug");
        if (mrafsParm->OptResidencies) {
            sprintf(pbuffer, " -Residencies %lu", 
-                   afs_cast_uint32(mrafsParm->OptResidencies));
+                   afs_printable_uint32_lu(mrafsParm->OptResidencies));
            strcat(tbuffer, pbuffer);
        }
     }

diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c
index 88ba957bd81ad2d937b1d3408db54744bace0a99..fc8ecb8819ae944b0b0146ec5556fe2e51d2cbb1 100644 (file)
--- a/src/bucoord/commands.c
+++ b/src/bucoord/commands.c
@@ -940,7 +940,7 @@ bc_JobsCmd(struct cmd_syndesc *as, void *arock)
            if (statusPtr->dbDumpId)
                printf(": DumpID %u", statusPtr->dbDumpId);
            if (statusPtr->nKBytes)
-               printf(", %ld Kbytes", afs_cast_int32(statusPtr->nKBytes));
+               printf(", %ld Kbytes", afs_printable_int32_ld(statusPtr->nKBytes));
            if (strlen(statusPtr->volumeName) != 0)
                printf(", volume %s", statusPtr->volumeName);
 

diff --git a/src/butc/dump.c b/src/butc/dump.c
index 437c98993b7106f9c201f09666bc23cc42879fe5..c48141c3953dc9902e08695d80a498b047782b90 100644 (file)
--- a/src/butc/dump.c
+++ b/src/butc/dump.c
@@ -1371,7 +1371,7 @@ Dumper(void *param)
                tmend.tm_hour, tmend.tm_min, tmend.tm_sec, hrs, min, sec,
                nodePtr->volumeSetName, dumpedvolumes,
                dumpedvolumes + failedvolumes,
-               dparams.tapeInfoPtr->kBytes + 1);
+               afs_printable_uint32_lu(dparams.tapeInfoPtr->kBytes + 1));
 
        fwrite(line, strlen(line), 1, centralLogIO);
        fflush(centralLogIO);

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index bb1813109260737e2055f9be9ff044f3ace51d2a..c2f12f0b84ab4a61ef251606ecb01679d44bf0f5 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -799,7 +799,7 @@ GetConfigParams(char *filename, afs_int32 port)
        statusSize *= BufferSize;
        if (statusSize < 0)
            statusSize = 0x7fffffff;    /*max size */
-       printf("Status every %ld Bytes\n", afs_cast_int32(statusSize));
+       printf("Status every %ld Bytes\n", afs_printable_int32_ld(statusSize));
     }
 
   error_exit:

diff --git a/src/config/stds.h b/src/config/stds.h
index 2023fa70c422862e75dcf84b97734cb3966f3520..5995aae3de9884dff59c09e2f794e64b2eb4deb4 100644 (file)
--- a/src/config/stds.h
+++ b/src/config/stds.h
@@ -309,12 +309,8 @@ typedef struct afsUUID afsUUID;
 #define hdr_static_inline(x) static inline x
 #endif
 
-#ifdef  AFS_64BIT_ENV
-hdr_static_inline(afs_int32) afs_cast_int32(afs_int32 d) { return (afs_int32) d; }
-hdr_static_inline(afs_uint32) afs_cast_uint32(afs_uint32 d) { return (afs_uint32) d; }
-#else
-hdr_static_inline(long) afs_cast_int32(afs_int32 d) { return (long) d; }
-hdr_static_inline(unsigned long) afs_cast_uint32(afs_uint32 d) { return (unsigned long) d; }
-#endif
+hdr_static_inline(long) afs_printable_int32_ld(afs_int32 d) { return (long) d; }
+
+hdr_static_inline(unsigned long) afs_printable_uint32_lu(afs_uint32 d) { return (unsigned long) d; }
 
 #endif /* OPENAFS_CONFIG_AFS_STDS_H */

diff --git a/src/des/quad_cksum.c b/src/des/quad_cksum.c
index 636d69b04244fc175df379d9859f99f5d6544187..58af958af376664e3887d8176d8a05d72532fdb5 100644 (file)
--- a/src/des/quad_cksum.c
+++ b/src/des/quad_cksum.c
@@ -147,7 +147,8 @@ des_quad_cksum(unsigned char *in, afs_uint32 * out, afs_int32 length,
            z = ((x * x) + (x2 * x2)) % 0x7fffffff;
            z2 = (x * (x2 + 83653421)) % 0x7fffffff;    /* modulo */
            if (des_debug & 8)
-               printf("%ld %ld\n", z, z2);
+               printf("%ld %ld\n", afs_printable_int32_ld(z),
+                      afs_printable_int32_ld(z2));
        }
 
        if (out != NULL) {

diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c
index 9f27b3138da2b34d0863dcd06af0c7c85ef26e08..ccf94838b584a17eacc1b8e0a54272eedb9ef3a3 100644 (file)
--- a/src/kauth/admin_tools.c
+++ b/src/kauth/admin_tools.c
@@ -411,11 +411,11 @@ parse_flags(char *name, char *inst, char *str, afs_int32 * flags)
     str = lcstring(bitspec, str, sizeof(bitspec));
     if (isdigit(*str)) {
        if (strncmp(str, "0x", 2) == 0) /* 0x => hex */
-           sscanf(str, "0x%lx", &f);
+           sscanf(str, "0x%lx", (long unsigned int *) &f);
        else if (*str == '0')   /* assume octal */
-           sscanf(str, "%lo", &f);
+           sscanf(str, "%lo", (long unsigned int *) &f);
        else                    /* just assume hex */
-           sscanf(str, "%lx", &f);
+           sscanf(str, "%lx", (long unsigned int *) &f);
     } else {
        if (*str == '=') {
            str++;
@@ -1078,7 +1078,7 @@ GetRandomKey(struct cmd_syndesc *as, void *arock)
        ka_PrintBytes((char *)&key, sizeof(key));
        printf(" (");
        for (i = 0; i < sizeof(key); i++) {
-           printf("%0.2x", ((char *)&key)[i] & 0xff);
+           printf("%.2x", ((char *)&key)[i] & 0xff);
            if (i == 3)
                printf(" ");
            else if (i != 7)
@@ -1114,7 +1114,7 @@ Statistics(struct cmd_syndesc *as, void *arock)
           (double)dynamics.hashTableUtilization / 100.0);
     ka_timestr(dynamics.start_time, bob, KA_TIMESTR_LEN);
     printf("From host %lx started at %s:\n", 
-          afs_cast_uint32(dynamics.host), bob);
+          afs_printable_uint32_lu(dynamics.host), bob);
 
 #define print_stat(name) if (dynamics.name.requests) printf ("  of %d requests for %s, %d were aborted.\n", dynamics.name.requests, # name, dynamics.name.aborts)
     print_stat(Authenticate);
@@ -1205,7 +1205,7 @@ DebugInfo(struct cmd_syndesc *as, void *arock)
     }
     ka_timestr(info.startTime, bob, KA_TIMESTR_LEN);
     printf("From host %lx started %sat %s:\n", 
-          afs_cast_uint32(info.host),
+          afs_printable_uint32_lu(info.host),
           (info.noAuth ? "w/o authorization " : ""), bob);
     ka_timestr(info.lastTrans, bob, KA_TIMESTR_LEN);
     printf("Last trans was %s at %s\n", info.lastOperation, bob);
@@ -1220,8 +1220,8 @@ DebugInfo(struct cmd_syndesc *as, void *arock)
           info.updatesRemaining);
     if (info.cheader_lock || info.keycache_lock)
        printf("locks: cheader %08lx, keycache %08lx\n", 
-               afs_cast_uint32(info.cheader_lock),
-               afs_cast_uint32(info.keycache_lock));
+               afs_printable_uint32_lu(info.cheader_lock),
+               afs_printable_uint32_lu(info.keycache_lock));
     printf("Last authentication for %s, last admin user was %s\n",
           info.lastAuth, info.lastAdmin);
     printf("Last TGS op was a %s ticket was for %s\n", info.lastTGSServer,

diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c
index 3f32c3a9943495a71d6bac11e3d785ab54638b59..02aa98b011d95c2465a4c2681579d50b84e1d8a7 100644 (file)
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
     }
 
     printf("\n");
-    printf("Client %s (port %d) is in cell %s\n", srvrName, srvrPort,
+    printf("Client %s (port %ld) is in cell %s\n", srvrName, srvrPort,
           cellName);
     printf("\n");
 

diff --git a/src/libadmin/samples/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c
index 33cf83c0a14ab2a33e1cf68fa940b822487c3f3a..07a613c01afc3d1e13e9db09cbbd321ad1796561 100644 (file)
--- a/src/libadmin/samples/rxdebug_conns.c
+++ b/src/libadmin/samples/rxdebug_conns.c
@@ -106,11 +106,11 @@ main(int argc, char *argv[])
 
     printf("\n");
     if (allconns) {
-       printf("Listing all connections for server %s (port %d)\n", srvrName,
+       printf("Listing all connections for server %s (port %ld)\n", srvrName,
               srvrPort);
     } else {
        printf
-           ("Listing only interesting connections for server %s (port %d)\n",
+           ("Listing only interesting connections for server %s (port %ld)\n",
             srvrName, srvrPort);
     }
 

diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c
index a07c6a412bc52acf968a5b16ac8924e665ab2cda..43e11ddc7b144a62a53514ee8b59695aff68b233 100644 (file)
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
     }
 
     printf("\n");
-    printf("RX stats: host %s (port %d)\n", srvrName, srvrPort);
+    printf("RX stats: host %s (port %ld)\n", srvrName, srvrPort);
     printf("\n");
     printf("    packetRequests:              %d\n", stats.packetRequests);
     printf("    receivePktAllocFailures:     %d\n",

diff --git a/src/libadmin/samples/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c
index e14c853c99b55a2e6b532bddef34acb4c3f2d792..4a2153a2a4fdf28b0eabab1521bd5c31b1757d2f 100644 (file)
--- a/src/libadmin/samples/rxdebug_supported_stats.c
+++ b/src/libadmin/samples/rxdebug_supported_stats.c
@@ -36,7 +36,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxdebug_supported_stats <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/test/util.h b/src/libadmin/test/util.h
index 5ea0bfb7ead61a856b2cd849fa2f827eac07b690..dd1bb55dabb2ce7e8cb70f018d44b37bc159f129 100644 (file)
--- a/src/libadmin/test/util.h
+++ b/src/libadmin/test/util.h
@@ -18,6 +18,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#ifndef AFS_NT40_ENV
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
 
 #include <pthread.h>
 

diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c
index 57b1204ce56fdf228540fa0adb7dfd4f1a7f6af5..ea09921a65744e591712b09405d9cf41af2c4c57 100644 (file)
--- a/src/libadmin/test/vos.c
+++ b/src/libadmin/test/vos.c
@@ -138,11 +138,13 @@ GetAddressFromString(const char *addr_str)
     return ntohl(addr);
 }
 
+#if 0
 static void
 PrintMessage(vos_messageType_t type, char *message)
 {
     printf("%s\n", message);
 }
+#endif
 
 int
 DoVosBackupVolumeCreate(struct cmd_syndesc *as, void *arock)
@@ -1539,7 +1541,6 @@ int
 DoVosPartitionNameToId(struct cmd_syndesc *as, void *arock)
 {
     typedef enum { PARTITION } DoVosPartitionNameToId_parm_t;
-    afs_status_t st = 0;
     unsigned int partition_id = 0;
 
     if (as->parms[PARTITION].items) {
@@ -1673,7 +1674,7 @@ Print_vos_volintInfo(afs_uint32 server, afs_uint32 partition, volintInfo* pinfo,
     
     
     printf("%sname\t\t%s\n",prefix, pinfo->name);
-    printf("%sid\t\t%lu\n",prefix, pinfo->volid);
+    printf("%sid\t\t%lu\n",prefix, afs_printable_uint32_lu(pinfo->volid));
     printf("%sserv\t\t%s\t%s\n",prefix, address,hostname);
     printf("%spart\t\t%u\n", prefix,partition);
     
@@ -1688,9 +1689,12 @@ Print_vos_volintInfo(afs_uint32 server, afs_uint32 partition, volintInfo* pinfo,
        printf("%sstatus\t\tUNATTACHABLE\n",prefix);
        return;
     }
-    printf("%sbackupID\t%lu\n",prefix, pinfo->backupID);
-    printf("%sparentID\t%lu\n",prefix, pinfo->parentID);
-    printf("%scloneID\t%lu\n",prefix, pinfo->cloneID);
+    printf("%sbackupID\t%lu\n",prefix,
+          afs_printable_uint32_lu(pinfo->backupID));
+    printf("%sparentID\t%lu\n",prefix,
+          afs_printable_uint32_lu(pinfo->parentID));
+    printf("%scloneID\t%lu\n",prefix,
+          afs_printable_uint32_lu(pinfo->cloneID));
     printf("%sinUse\t\t%s\n",prefix, pinfo->inUse ? "Y" : "N");
     printf("%sneedsSalvaged\t%s\n",prefix, pinfo->needsSalvaged ? "Y" : "N");
     /* 0xD3 is from afs/volume.h since I had trouble including the file */
@@ -1709,21 +1713,30 @@ Print_vos_volintInfo(afs_uint32 server, afs_uint32 partition, volintInfo* pinfo,
        printf("%stype\t\t?\n",prefix);
        break;
     }
-    printf("%screationDate\t%-9lu\n", prefix,pinfo->creationDate);
-    printf("%saccessDate\t%-9lu\n", prefix,pinfo->accessDate);
-    printf("%supdateDate\t%-9lu\n", prefix,pinfo->updateDate);
-    printf("%sbackupDate\t%-9lu\n", prefix,pinfo->backupDate);
-    printf("%scopyDate\t%-9lu\n", prefix,pinfo->copyDate);
+    printf("%screationDate\t%-9lu\n", prefix,
+          afs_printable_uint32_lu(pinfo->creationDate));
+    printf("%saccessDate\t%-9lu\n", prefix,
+          afs_printable_uint32_lu(pinfo->accessDate));
+    printf("%supdateDate\t%-9lu\n", prefix,
+          afs_printable_uint32_lu(pinfo->updateDate));
+    printf("%sbackupDate\t%-9lu\n", prefix,
+          afs_printable_uint32_lu(pinfo->backupDate));
+    printf("%scopyDate\t%-9lu\n", prefix,
+          afs_printable_uint32_lu(pinfo->copyDate));
            
     printf("%sflags\t\t%#lx\t(Optional)\n",prefix, pinfo->flags);
     printf("%sdiskused\t%u\n",prefix, pinfo->size);
     printf("%smaxquota\t%u\n",prefix, pinfo->maxquota);
-    printf("%sminquota\t%lu\t(Optional)\n",prefix, pinfo->spare0);
+    printf("%sminquota\t%lu\t(Optional)\n",prefix,
+          afs_printable_uint32_lu(pinfo->spare0));
     printf("%sfilecount\t%u\n",prefix, pinfo->filecount);
     printf("%sdayUse\t\t%u\n",prefix, pinfo->dayUse);
-    printf("%sweekUse\t%lu\t(Optional)\n",prefix, pinfo->spare1);
-    printf("%svolUpdateCounter\t\t%lu\t(Optional)\n",prefix, pinfo->spare2);
-    printf("%sspare3\t\t%lu\t(Optional)\n",prefix, pinfo->spare3);
+    printf("%sweekUse\t%lu\t(Optional)\n",prefix,
+          afs_printable_uint32_lu(pinfo->spare1));
+    printf("%svolUpdateCounter\t\t%lu\t(Optional)\n",prefix,
+           afs_printable_uint32_lu(pinfo->spare2));
+    printf("%sspare3\t\t%lu\t(Optional)\n",prefix,
+          afs_printable_uint32_lu(pinfo->spare3));
 }
 
 int

diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c
index 9d66070c8bde3c6d5213c5830ffc89b5688c3b85..4cf847ad82d26d61abd8316f0b5d6c9915b4a8ba 100644 (file)
--- a/src/rx/rx_event.c
+++ b/src/rx/rx_event.c
@@ -225,8 +225,11 @@ _rxevent_Post(struct clock *when, struct clock *now,
     if (rx_Log_event) {
        struct clock now1;
        clock_GetTime(&now1);
-       fprintf(rx_Log_event, "%d.%d: rxevent_Post(%d.%d, %lp, %lp, %lp, %d)\n",
-               (int)now1.sec, (int)now1.usec, (int)when->sec, (int)when->usec,
+       fprintf(rx_Log_event, "%ld.%ld: rxevent_Post(%ld.%ld, %lp, %lp, %lp, %d)\n",
+               afs_printable_int32_ld(now1.sec),
+               afs_printable_int32_ld(now1.usec),
+               afs_printable_int32_ld(when->sec),
+               afs_printable_int32_ld(when->usec),
                func, arg,
                arg1, arg2);
     }

diff --git a/src/ubik/utst_client.c b/src/ubik/utst_client.c
index d73e6bdd4c883eedddc0095fa4b3e18b340f45e9..c8c1f0bb78f91fe762262f41e6b87f9c69c78da3 100644 (file)
--- a/src/ubik/utst_client.c
+++ b/src/ubik/utst_client.c
@@ -115,32 +115,36 @@ main(int argc, char **argv)
                temp = 0;
                code = ubik_SAMPLE_Get(cstruct, 0, &temp);
                if (code != 0) {
-                   printf("SAMPLE_Get #1 failed with code %ld\n", code);
+                   printf("SAMPLE_Get #1 failed with code %ld\n",
+                          afs_printable_int32_ld(code));
                } else {
-                   printf("SAMPLE_Get #1 succeeded, got value %d\n", temp);
+                   printf("SAMPLE_Get #1 succeeded, got value %ld\n",
+                          afs_printable_int32_ld(temp));
                }
 
                temp = 0;
                code = ubik_SAMPLE_Inc(cstruct, 0);
                if (code != 0) {
                    printf("SAMPLE_Inc #1 failed with code %ld\n", 
-                          afs_cast_int32(code));
+                          afs_printable_int32_ld(code));
                } else {
                    printf("SAMPLE_Inc #1 succeeded, incremented integer\n");
                }
                temp = 0;
                code = ubik_SAMPLE_Get(cstruct, 0, &temp);
                if (code != 0) {
-                   printf("SAMPLE_Get #2 failed with code %ld\n", code);
+                   printf("SAMPLE_Get #2 failed with code %ld\n",
+                          afs_printable_int32_ld(code));
                } else {
-                   printf("SAMPLE_Get #2 succeeded, got value %d\n", temp);
+                   printf("SAMPLE_Get #2 succeeded, got value %ld\n",
+                          afs_printable_int32_ld(temp));
                }
 
                temp = 0;
                code = ubik_SAMPLE_Inc(cstruct, 0);
                if (code != 0)
                    printf("SAMPLE_Inc #2 failed with code %ld\n", 
-                          afs_cast_int32(code));
+                          afs_printable_int32_ld(code));
                else
                    printf("SAMPLE_Inc #2 succeeded, incremented integer\n");
 

diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
index 837499dd962b616dacfe513f030650c44b7d8260..f93b9053bd2153c27231ce9528da425fc773879f 100644 (file)
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -1085,7 +1085,7 @@ uss_vol_GetVolInfoFromMountPoint(char *a_mountpoint)
        return (-1);
     }
     if (vldbEntry.nServers != 1) {
-       printf("s: Volume '%s' (ID %d) exists on multiple servers!!\n",
+       printf("%s: Volume '%s' (ID %d) exists on multiple servers!!\n",
               uss_whoami, uss_Volume, volID);
        return (-1);
     }

diff --git a/src/viced/host.c b/src/viced/host.c
index b9deffd74a77d8ded821b32a7391790531efd0bc..f4ec5e18528935301c153d53153dbc100299719f 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -2701,7 +2701,7 @@ h_DumpHost(register struct host *host, int held, void *rock)
        sprintf(tmpStr, "%04x", host->holds[i]);
        (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
     }
-    sprintf(tmpStr, " slot/bit: %d/%d\n", h_holdSlot(), h_holdbit());
+    sprintf(tmpStr, " slot/bit: %ld/%d\n", h_holdSlot(), h_holdbit());
     (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
 
     H_UNLOCK;

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 3a5595bd7b83fd37a03d926f76c762da090a0b1d..45bb1f3a381a33e702321b3b0120499a29b6abf5 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -1293,7 +1293,7 @@ ParseArgs(int argc, char *argv[])
            rxMaxMTU = atoi(argv[++i]);
            if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || 
                (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
-               printf("rxMaxMTU %d%% invalid; must be between %d-%d\n",
+               printf("rxMaxMTU %d%% invalid; must be between %d-%lu\n",
                       rxMaxMTU, RX_MIN_PACKET_SIZE, 
                       RX_MAX_PACKET_DATA_SIZE);
                return -1;

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 19f80f73da0ba31f4aeff6155a56388bf91029cd..1151759076d40384d3dae38866952bb47f078d4e 100644 (file)
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -195,7 +195,7 @@ main(int argc, char **argv)
            rxMaxMTU = atoi(argv[++index]);
            if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || 
                (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
-               printf("rxMaxMTU %lu invalid; must be between %d-%d\n",
+               printf("rxMaxMTU %d invalid; must be between %d-%lu\n",
                       rxMaxMTU, RX_MIN_PACKET_SIZE, 
                       RX_MAX_PACKET_DATA_SIZE);
                return -1;

diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c
index 2c0c5e76a50223a5728f2afb47a5197e56fd4502..f8436e808c9dbc322583673e298eace5f35b7a8b 100644 (file)
--- a/src/vol/fssync-debug.c
+++ b/src/vol/fssync-debug.c
@@ -896,7 +896,7 @@ VolOpQuery(struct cmd_syndesc * as, void * rock)
        printf("\t\treason         = %d (%s)\n", 
               vop.com.reason, reason_code_to_string(vop.com.reason));
        printf("\t\tcommand_len    = %u\n", vop.com.command_len);
-       printf("\t\tflags          = 0x%lux\n", afs_cast_uint32(vop.com.flags));
+       printf("\t\tflags          = 0x%lux\n", afs_printable_uint32_lu(vop.com.flags));
        printf("\t}\n");
 
        printf("\tvop = {\n");

diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 6fd304e3e5b661a06d1687eed6a1e5d76e2cae33..ef604201aea6199386ffbe0a0fc7e5014566d3fd 100644 (file)
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -575,7 +575,7 @@ FSYNC_com_VolOn(FSSYNC_VolOp_command * vcom, SYNC_response * res)
     }
 #else /* !AFS_DEMAND_ATTACH_FS */
     tvolName[0] = '/';
-    snprintf(&tvolName[1], sizeof(tvolName)-1, VFORMAT, afs_cast_uint32(vcom->vop->volume));
+    snprintf(&tvolName[1], sizeof(tvolName)-1, VFORMAT, afs_printable_uint32_lu(vcom->vop->volume));
     tvolName[sizeof(tvolName)-1] = '\0';
 
     vp = VAttachVolumeByName_r(&error, vcom->vop->partName, tvolName,
@@ -1484,7 +1484,7 @@ FSYNC_Drop(osi_socket fd)
            Volume *vp;
 
            tvolName[0] = '/';
-           sprintf(&tvolName[1], VFORMAT, afs_cast_uint32(p[i].volumeID));
+           sprintf(&tvolName[1], VFORMAT, afs_printable_uint32_lu(p[i].volumeID));
            vp = VAttachVolumeByName_r(&error, p[i].partName, tvolName,
                                       V_VOLUPD);
            if (vp)

diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index b5d03791fb61847f008aed8b708fb09cad3666c9..9cbaaa2b0901a26e5f58f546c882477341e6a956 100644 (file)
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -1454,7 +1454,7 @@ inode_ConvertROtoRWvolume(char *pname, afs_uint32 volumeId)
 
     memset(&specinos, 0, sizeof(specinos));
           
-    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_cast_uint32(volumeId));
+    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_printable_uint32_lu(volumeId));
     (void)afs_snprintf(oldpath, sizeof oldpath, "%s/%s", pname, headername);
     fd = open(oldpath, O_RDONLY);
     if (fd < 0) {
@@ -1557,7 +1557,7 @@ inode_ConvertROtoRWvolume(char *pname, afs_uint32 volumeId)
     }
 #endif
 
-    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_cast_uint32(h.id));
+    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_printable_uint32_lu(h.id));
     (void)afs_snprintf(newpath, sizeof newpath, "%s/%s", pname, headername);
     fd = open(newpath, O_CREAT | O_EXCL | O_RDWR, 0644);
     if (fd < 0) {

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 9aeb53d744020b1e4df713c2d78a985acf5613eb..8548ffe65d0ca12560fd80ac479fe6975b0f97f9 100644 (file)
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -1640,7 +1640,7 @@ namei_ConvertROtoRWvolume(char *pname, afs_uint32 volumeId)
     char headername[16];
     afs_int32 error = 0;
 
-    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_cast_uint32(volumeId));
+    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_printable_uint32_lu(volumeId));
     (void)afs_snprintf(oldpath, sizeof oldpath, "%s/%s", pname, headername);
     fd = open(oldpath, O_RDONLY);
     if (fd < 0) {
@@ -1790,7 +1790,7 @@ namei_ConvertROtoRWvolume(char *pname, afs_uint32 volumeId)
     h.smallVnodeIndex_hi = h.id;
     h.largeVnodeIndex_hi = h.id;
     h.linkTable_hi = h.id;
-    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_cast_uint32(h.id));
+    (void)afs_snprintf(headername, sizeof headername, VFORMAT, afs_printable_uint32_lu(h.id));
     (void)afs_snprintf(newpath, sizeof newpath, "%s/%s", pname, headername);
     fd = open(newpath, O_CREAT | O_EXCL | O_RDWR, 0644);
     if (fd < 0) {

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index 722700061338e1bc8fcfeacfac9d3010cd7b56ad..a416f0bc19e579f33b0adda89cc5365c6dac2762 100644 (file)
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -321,7 +321,7 @@ handleit(struct cmd_syndesc *as, void *arock)
            }
        }
        (void)afs_snprintf(name1, sizeof name1, VFORMAT,
-                          afs_cast_uint32(volumeId));
+                          afs_printable_uint32_lu(volumeId));
        if (dsizeOnly && !saveinodes)
            printf
                ("Volume-Id\t  Volsize  Auxsize Inodesize  AVolsize SizeDiff                (VolName)\n");

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index cdc56dbf0385c4a7b832c2cfd459ea3ac5e43c87..e98b440bf0f9e4e6644f5be9e15d9dcb0287598a 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -1291,7 +1291,7 @@ GetVolumeSummary(VolumeId singleVolumeNumber)
                    || (vsp->header.id == singleVolumeNumber
                        || vsp->header.parent == singleVolumeNumber)) {
                    (void)afs_snprintf(nameShouldBe, sizeof nameShouldBe,
-                                      VFORMAT, afs_cast_uint32(vsp->header.id));
+                                      VFORMAT, afs_printable_uint32_lu(vsp->header.id));
                    if (singleVolumeNumber 
                        && vsp->header.id != singleVolumeNumber)
                        AskOffline(vsp->header.id, fileSysPartition->name);
@@ -1742,7 +1742,7 @@ SalvageVolumeHeaderFile(register struct InodeSummary *isp,
     if (isp->volSummary == NULL) {
        char path[64];
        char headerName[64];
-       (void)afs_snprintf(headerName, sizeof headerName, VFORMAT, afs_cast_uint32(isp->volumeId));
+       (void)afs_snprintf(headerName, sizeof headerName, VFORMAT, afs_printable_uint32_lu(isp->volumeId));
        (void)afs_snprintf(path, sizeof path, "%s/%s", fileSysPath, headerName);
        if (check) {
            Log("No header file for volume %u\n", isp->volumeId);
@@ -1771,7 +1771,7 @@ SalvageVolumeHeaderFile(register struct InodeSummary *isp,
            if (isp->volSummary->fileName) {
                strcpy(headerName, isp->volSummary->fileName);
            } else {
-               (void)afs_snprintf(headerName, sizeof headerName, VFORMAT, afs_cast_uint32(isp->volumeId));
+               (void)afs_snprintf(headerName, sizeof headerName, VFORMAT, afs_printable_uint32_lu(isp->volumeId));
                isp->volSummary->fileName = ToString(headerName);
            }
            (void)afs_snprintf(path, sizeof path, "%s/%s", fileSysPath, headerName);

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 523e1d80a49663216cc1803c5041df01095d6dc3..ef3aeef455b175987d843a808c7339b3542272a5 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -4879,7 +4879,7 @@ VGetVolumePath(Error * ec, VolId volumeId, char **partitionp, char **namep)
 
     *ec = 0;
     name[0] = '/';
-    (void)afs_snprintf(&name[1], (sizeof name) - 1, VFORMAT, afs_cast_uint32(volumeId));
+    (void)afs_snprintf(&name[1], (sizeof name) - 1, VFORMAT, afs_printable_uint32_lu(volumeId));
     for (dp = DiskPartitionList; dp; dp = dp->next) {
        struct afs_stat status;
        strcpy(path, VPartitionPath(dp));
@@ -4942,7 +4942,7 @@ char *
 VolumeExternalName(VolumeId volumeId)
 {
     static char name[VMAXPATHLEN];
-    (void)afs_snprintf(name, sizeof name, VFORMAT, afs_cast_uint32(volumeId));
+    (void)afs_snprintf(name, sizeof name, VFORMAT, afs_printable_uint32_lu(volumeId));
     return name;
 }
 
@@ -4966,7 +4966,7 @@ VolumeExternalName(VolumeId volumeId)
 static int
 VolumeExternalName_r(VolumeId volumeId, char * name, size_t len)
 {
-    return afs_snprintf(name, len, VFORMAT, afs_cast_uint32(volumeId));
+    return afs_snprintf(name, len, VFORMAT, afs_printable_uint32_lu(volumeId));
 }
 #endif
 

diff --git a/src/vol/vutil.c b/src/vol/vutil.c
index 259aabff8eeedbf56a210127f5a4c493d3395a6e..f508e39606697dd66d6ed7473add1a4283b858e4 100644 (file)
--- a/src/vol/vutil.c
+++ b/src/vol/vutil.c
@@ -165,7 +165,7 @@ VCreateVolume_r(Error * ec, char *partname, VolId volumeId, VolId parentId)
     vol.stamp.magic = VOLUMEINFOMAGIC;
     vol.stamp.version = VOLUMEINFOVERSION;
     vol.destroyMe = DESTROY_ME;
-    (void)afs_snprintf(headerName, sizeof headerName, VFORMAT, afs_cast_uint32(vol.id));
+    (void)afs_snprintf(headerName, sizeof headerName, VFORMAT, afs_printable_uint32_lu(vol.id));
     (void)afs_snprintf(volumePath, sizeof volumePath, "%s/%s",
                       VPartitionPath(partition), headerName);
     fd = afs_open(volumePath, O_CREAT | O_EXCL | O_WRONLY, 0600);

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 4c15cc8dcc479e7460eac517268c4ece486dd65c..1be394e8d0f6f99184a64370c922f89ae2edf8ec 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -879,7 +879,7 @@ XDisplayFormat2(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
                }
 
                fprintf(STDOUT, "name\t\t%s\n", a_xInfoP->name);
-               fprintf(STDOUT, "id\t\t%lu\n", afs_cast_uint32(a_xInfoP->volid));
+               fprintf(STDOUT, "id\t\t%lu\n", afs_printable_uint32_lu(a_xInfoP->volid));
                fprintf(STDOUT, "serv\t\t%s\t%s\n", address, hostname);
                fprintf(STDOUT, "part\t\t%s\n", pname);
                switch (a_xInfoP->status) {
@@ -894,11 +894,11 @@ XDisplayFormat2(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
                        return;
                }
                fprintf(STDOUT, "backupID\t%lu\n", 
-                       afs_cast_uint32(a_xInfoP->backupID));
+                       afs_printable_uint32_lu(a_xInfoP->backupID));
                fprintf(STDOUT, "parentID\t%lu\n", 
-                       afs_cast_uint32(a_xInfoP->parentID));
+                       afs_printable_uint32_lu(a_xInfoP->parentID));
                fprintf(STDOUT, "cloneID\t\t%lu\n", 
-                       afs_cast_uint32(a_xInfoP->cloneID));
+                       afs_printable_uint32_lu(a_xInfoP->cloneID));
                fprintf(STDOUT, "inUse\t\t%s\n", a_xInfoP->inUse ? "Y" : "N");
                switch (a_xInfoP->type) {
                case 0:
@@ -915,19 +915,19 @@ XDisplayFormat2(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
                        break;
                }
                fprintf(STDOUT, "creationDate\t%-9lu\t%s", 
-                       afs_cast_uint32(a_xInfoP->creationDate),
+                       afs_printable_uint32_lu(a_xInfoP->creationDate),
                        vos_ctime(&a_xInfoP->creationDate));
                fprintf(STDOUT, "accessDate\t%-9lu\t%s", 
-                       afs_cast_uint32(a_xInfoP->accessDate),
+                       afs_printable_uint32_lu(a_xInfoP->accessDate),
                        vos_ctime(&a_xInfoP->accessDate));
                fprintf(STDOUT, "updateDate\t%-9lu\t%s", 
-                       afs_cast_uint32(a_xInfoP->updateDate),
+                       afs_printable_uint32_lu(a_xInfoP->updateDate),
                        vos_ctime(&a_xInfoP->updateDate));
                fprintf(STDOUT, "backupDate\t%-9lu\t%s", 
-                       afs_cast_uint32(a_xInfoP->backupDate),
+                       afs_printable_uint32_lu(a_xInfoP->backupDate),
                        vos_ctime(&a_xInfoP->backupDate));
                fprintf(STDOUT, "copyDate\t%-9lu\t%s", 
-                       afs_cast_uint32(a_xInfoP->copyDate),
+                       afs_printable_uint32_lu(a_xInfoP->copyDate),
                        vos_ctime(&a_xInfoP->copyDate));
                
                fprintf(STDOUT, "diskused\t%u\n", a_xInfoP->size);
@@ -1033,7 +1033,7 @@ DisplayFormat2(long server, long partition, volintInfo *pntr)
     }
     fprintf(STDOUT, "name\t\t%s\n", pntr->name);
     fprintf(STDOUT, "id\t\t%lu\n", 
-           afs_cast_uint32(pntr->volid));
+           afs_printable_uint32_lu(pntr->volid));
     fprintf(STDOUT, "serv\t\t%s\t%s\n", address, hostname);
     fprintf(STDOUT, "part\t\t%s\n", pname);
     switch (pntr->status) {
@@ -1048,11 +1048,11 @@ DisplayFormat2(long server, long partition, volintInfo *pntr)
        return;
     }
     fprintf(STDOUT, "backupID\t%lu\n", 
-           afs_cast_uint32(pntr->backupID));
+           afs_printable_uint32_lu(pntr->backupID));
     fprintf(STDOUT, "parentID\t%lu\n", 
-           afs_cast_uint32(pntr->parentID));
+           afs_printable_uint32_lu(pntr->parentID));
     fprintf(STDOUT, "cloneID\t\t%lu\n", 
-           afs_cast_uint32(pntr->cloneID));
+           afs_printable_uint32_lu(pntr->cloneID));
     fprintf(STDOUT, "inUse\t\t%s\n", pntr->inUse ? "Y" : "N");
     fprintf(STDOUT, "needsSalvaged\t%s\n", pntr->needsSalvaged ? "Y" : "N");
     /* 0xD3 is from afs/volume.h since I had trouble including the file */
@@ -1072,34 +1072,34 @@ DisplayFormat2(long server, long partition, volintInfo *pntr)
        break;
     }
     fprintf(STDOUT, "creationDate\t%-9lu\t%s", 
-           afs_cast_uint32(pntr->creationDate),
+           afs_printable_uint32_lu(pntr->creationDate),
            vos_ctime(&pntr->creationDate));
     fprintf(STDOUT, "accessDate\t%-9lu\t%s", 
-           afs_cast_uint32(pntr->accessDate),
+           afs_printable_uint32_lu(pntr->accessDate),
            vos_ctime(&pntr->accessDate));
     fprintf(STDOUT, "updateDate\t%-9lu\t%s", 
-           afs_cast_uint32(pntr->updateDate),
+           afs_printable_uint32_lu(pntr->updateDate),
            vos_ctime(&pntr->updateDate));
     fprintf(STDOUT, "backupDate\t%-9lu\t%s", 
-           afs_cast_uint32(pntr->backupDate),
+           afs_printable_uint32_lu(pntr->backupDate),
            vos_ctime(&pntr->backupDate));
     fprintf(STDOUT, "copyDate\t%-9lu\t%s", 
-           afs_cast_uint32(pntr->copyDate),
+           afs_printable_uint32_lu(pntr->copyDate),
            vos_ctime(&pntr->copyDate));
     fprintf(STDOUT, "flags\t\t%#lx\t(Optional)\n", 
-           afs_cast_uint32(pntr->flags));
+           afs_printable_uint32_lu(pntr->flags));
     fprintf(STDOUT, "diskused\t%u\n", pntr->size);
     fprintf(STDOUT, "maxquota\t%u\n", pntr->maxquota);
     fprintf(STDOUT, "minquota\t%lu\t(Optional)\n", 
-           afs_cast_uint32(pntr->spare0));
+           afs_printable_uint32_lu(pntr->spare0));
     fprintf(STDOUT, "filecount\t%u\n", pntr->filecount);
     fprintf(STDOUT, "dayUse\t\t%u\n", pntr->dayUse);
     fprintf(STDOUT, "weekUse\t\t%lu\t(Optional)\n",
-           afs_cast_uint32(pntr->spare1));
+           afs_printable_uint32_lu(pntr->spare1));
     fprintf(STDOUT, "spare2\t\t%lu\t(Optional)\n", 
-           afs_cast_uint32(pntr->spare2));
+           afs_printable_uint32_lu(pntr->spare2));
     fprintf(STDOUT, "spare3\t\t%lu\t(Optional)\n", 
-           afs_cast_uint32(pntr->spare3));
+           afs_printable_uint32_lu(pntr->spare3));
     return;
 }