diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-04-13 23:03:15 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-04-13 23:03:15 +0000 |
| commit | 55f3ba00bca91ade2ad7b0be4a6cdb8ffa49166b (patch) | |
| tree | cddb633505731d49f3eedc8967eba842aacd06b3 | |
| parent | 93e5e4803f863ec61421e09cc0cad65534377ef8 (diff) | |
| download | nss-hg-55f3ba00bca91ade2ad7b0be4a6cdb8ffa49166b.tar.gz | |
Bugzilla bug 290233: fixed printf format related bugs reported as compiler
warnings. r=nelsonb.
Modified Files: addbuiltin.c rsaperf.c vfychain.c
| -rw-r--r-- | security/nss/cmd/addbuiltin/addbuiltin.c | 5 | ||||
| -rw-r--r-- | security/nss/cmd/rsaperf/rsaperf.c | 6 | ||||
| -rw-r--r-- | security/nss/cmd/vfychain/vfychain.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c index 763229f26..94de6f490 100644 --- a/security/nss/cmd/addbuiltin/addbuiltin.c +++ b/security/nss/cmd/addbuiltin/addbuiltin.c @@ -331,14 +331,15 @@ int main(int argc, char **argv) if (!addbuiltin.options[opt_Nickname].activated && !addbuiltin.options[opt_Trust].activated) { - fprintf(stderr, "%s: you must specify both a nickname and trust.\n"); + fprintf(stderr, "%s: you must specify both a nickname and trust.\n", + progName); Usage(progName); } if (addbuiltin.options[opt_Input].activated) { infile = PR_Open(addbuiltin.options[opt_Input].arg, PR_RDONLY, 00660); if (!infile) { - fprintf(stderr, "%s: failed to open input file.\n"); + fprintf(stderr, "%s: failed to open input file.\n", progName); exit(1); } } else { diff --git a/security/nss/cmd/rsaperf/rsaperf.c b/security/nss/cmd/rsaperf/rsaperf.c index 9eb917dc7..2424f31b8 100644 --- a/security/nss/cmd/rsaperf/rsaperf.c +++ b/security/nss/cmd/rsaperf/rsaperf.c @@ -527,7 +527,7 @@ main(int argc, char **argv) keybits = DEFAULT_KEY_BITS; } - printf("Using PKCS#11 with %d bits session key in token %s.\n", + printf("Using PKCS#11 with %ld bits session key in token %s.\n", keybits, PK11_GetTokenName(slot)); rsaparams.keySizeInBits = keybits; @@ -573,7 +573,7 @@ main(int argc, char **argv) doKeyGen = PR_TRUE; } } - printf("Using freebl with %d bits key.\n", keybits); + printf("Using freebl with %ld bits key.\n", keybits); if (doKeyGen) { fprintf(stderr,"\nGenerating RSA key. " "This may take a few moments.\n"); @@ -593,7 +593,7 @@ main(int argc, char **argv) fprintf(stderr,"Keygen completed.\n"); } else { /* use a hardcoded key */ - printf("Using hardcoded %d bits key.\n", keybits); + printf("Using hardcoded %ld bits key.\n", keybits); if (doPub) { pubKey = getDefaultRSAPublicKey(); } else { diff --git a/security/nss/cmd/vfychain/vfychain.c b/security/nss/cmd/vfychain/vfychain.c index a3b8d9d57..8f8757f3b 100644 --- a/security/nss/cmd/vfychain/vfychain.c +++ b/security/nss/cmd/vfychain/vfychain.c @@ -201,12 +201,12 @@ readCertFile(const char * fileName, PRBool isAscii) if (cc < 0) return cert; if (!remaining || cc > 0) { /* file was too big. */ - fprintf(stderr, "cert file %s was too big.\n"); + fprintf(stderr, "cert file %s was too big.\n", fileName); return cert; } total = pb - certBuf; if (!total) { /* file was empty */ - fprintf(stderr, "cert file %s was empty.\n"); + fprintf(stderr, "cert file %s was empty.\n", fileName); return cert; } if (isAscii) { |