From f3dcf1e07a88032b56deb2eee27d8515af183974 Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Fri, 1 Jun 2018 15:32:57 -0500 Subject: [PATCH] Resolve missing printf args A handful of printf's requested more args than they were given. The missing args are now provided. (via cppcheck) Change-Id: I3d2bfd1b68a3518ee4c8a65f02446a2bae85d926 Reviewed-on: https://gerrit.openafs.org/13155 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/ptserver/ptutils.c | 2 +- src/viced/viced.c | 2 +- src/vol/gi.c | 2 +- src/vol/xfs_size_check.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c index c551c62..dfa54ee 100644 --- a/src/ptserver/ptutils.c +++ b/src/ptserver/ptutils.c @@ -1559,7 +1559,7 @@ GetListSG2(struct ubik_trans *at, afs_int32 gid, prlist *alist, afs_int32 *sizeP didsomething ? "TRUE" : "FALSE"); if (predictflagged && didsomething != predictfound) fprintf(stderr, "**** for gid=%d, didsomething=%d predictfound=%d\n", - didsomething, predictfound); + gid, didsomething, predictfound); #endif if (didsomething) sg_found = add_map(sg_found, -gid); diff --git a/src/viced/viced.c b/src/viced/viced.c index b34436a..17cf1f8 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -1218,7 +1218,7 @@ ParseArgs(int argc, char *argv[]) #if defined(AFS_AIX32_ENV) if (cmd_OptionAsInt(opts, OPT_minspare, &aixlow_water) == 0) { if ((aixlow_water < 0) || (aixlow_water > 30)) { - printf("space reserved %d%% invalid; must be between 0-30%\n", + printf("space reserved %d%% invalid; must be between 0-30%%\n", aixlow_water); return -1; } diff --git a/src/vol/gi.c b/src/vol/gi.c index e4e7f7c..e193195 100644 --- a/src/vol/gi.c +++ b/src/vol/gi.c @@ -73,7 +73,7 @@ main(int argc, char **argv) printf ("Inode status: dev=%d, ino=%d, mode=%o, nlink=%d, uid=%d, gid=%d, size=%d, mtime=%d, blocks=%d\n", status.st_dev, status.st_ino, status.st_mode, status.st_nlink, - status.st_uid, status.st_gid, status.st_size, status.st_mtime); + status.st_uid, status.st_gid, status.st_size, status.st_mtime, status.st_blocks); } else { /* Send the inode to standard out */ char buf[4096]; diff --git a/src/vol/xfs_size_check.c b/src/vol/xfs_size_check.c index 5ee492b..a24364c 100644 --- a/src/vol/xfs_size_check.c +++ b/src/vol/xfs_size_check.c @@ -114,7 +114,7 @@ CheckPartitions() break; case VERIFY_ERROR: printf("%s: Can't check XFS inode size: %s\n", - strerror(errno)); + prog, strerror(errno)); break; case VERIFY_FIX: if (nAvail <= nParts) { @@ -172,7 +172,7 @@ main(int ac, char **av) #else /* AFS_SGI_XFS_IOPS_ENV */ main() { - printf("%s only runs on XFS platforms.\n, prog"); + printf("%s only runs on XFS platforms.\n", prog); exit(1); } #endif /* AFS_SGI_XFS_IOPS_ENV */ -- 1.9.4