From ac3e0ed03187cf7c8af046adb102d6500452815f Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 11 Jul 2009 00:41:02 +0100 Subject: [PATCH] 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 Reviewed-by: Russ Allbery --- src/auth/ktc.c | 4 +- src/bozo/bnode.c | 24 +++++----- src/bozo/bos.c | 4 +- src/bucoord/commands.c | 2 +- src/butc/dump.c | 2 +- src/butc/tcmain.c | 2 +- src/config/stds.h | 10 ++-- src/des/quad_cksum.c | 3 +- src/kauth/admin_tools.c | 16 +++---- src/libadmin/samples/cm_local_cell.c | 2 +- src/libadmin/samples/rxdebug_conns.c | 4 +- src/libadmin/samples/rxdebug_rx_stats.c | 2 +- .../samples/rxdebug_supported_stats.c | 2 +- src/libadmin/test/util.h | 6 +++ src/libadmin/test/vos.c | 41 +++++++++++------ src/rx/rx_event.c | 7 ++- src/ubik/utst_client.c | 16 ++++--- src/uss/uss_vol.c | 2 +- src/viced/host.c | 2 +- src/viced/viced.c | 2 +- src/vlserver/vlserver.c | 2 +- src/vol/fssync-debug.c | 2 +- src/vol/fssync-server.c | 4 +- src/vol/listinodes.c | 4 +- src/vol/namei_ops.c | 4 +- src/vol/vol-info.c | 2 +- src/vol/vol-salvage.c | 6 +-- src/vol/volume.c | 6 +-- src/vol/vutil.c | 2 +- src/volser/vos.c | 46 +++++++++---------- 30 files changed, 127 insertions(+), 104 deletions(-) diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 466607c94..01ec23378 100644 --- 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 b3cd61249..ddcc8662a 100644 --- 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 c7aa408b8..fc4bceba6 100644 --- 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 88ba957bd..fc8ecb881 100644 --- 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 437c98993..c48141c39 100644 --- 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 bb1813109..c2f12f0b8 100644 --- 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 2023fa70c..5995aae3d 100644 --- 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 636d69b04..58af958af 100644 --- 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 9f27b3138..ccf94838b 100644 --- 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 3f32c3a99..02aa98b01 100644 --- 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 33cf83c0a..07a613c01 100644 --- 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 a07c6a412..43e11ddc7 100644 --- 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 e14c853c9..4a2153a2a 100644 --- 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 \n"); exit(1); diff --git a/src/libadmin/test/util.h b/src/libadmin/test/util.h index 5ea0bfb7e..dd1bb55da 100644 --- a/src/libadmin/test/util.h +++ b/src/libadmin/test/util.h @@ -18,6 +18,12 @@ #include #include #include +#ifndef AFS_NT40_ENV +#include +#include +#include +#include +#endif #include diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c index 57b1204ce..ea09921a6 100644 --- 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 9d66070c8..4cf847ad8 100644 --- 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 d73e6bdd4..c8c1f0bb7 100644 --- 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 837499dd9..f93b9053b 100644 --- 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 b9deffd74..f4ec5e185 100644 --- 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 3a5595bd7..45bb1f3a3 100644 --- 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 19f80f73d..115175907 100644 --- 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 2c0c5e76a..f8436e808 100644 --- 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 6fd304e3e..ef604201a 100644 --- 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 b5d03791f..9cbaaa2b0 100644 --- 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 9aeb53d74..8548ffe65 100644 --- 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 722700061..a416f0bc1 100644 --- 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 cdc56dbf0..e98b440bf 100644 --- 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 523e1d80a..ef3aeef45 100644 --- 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 259aabff8..f508e3960 100644 --- 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 4c15cc8dc..1be394e8d 100644 --- 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; } -- 2.39.5