summaryrefslogtreecommitdiff
path: root/cmd/pk12util
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2018-02-14 18:46:10 +1100
committerMartin Thomson <martin.thomson@gmail.com>2018-02-14 18:46:10 +1100
commit61cc1fa706af88f1159f5089840b09e2b838d0f4 (patch)
tree0de9959927f7108c6d6a4c378c641dbf071b13aa /cmd/pk12util
parenta63322e39baae7b4c7f1f343891315973006493e (diff)
downloadnss-hg-61cc1fa706af88f1159f5089840b09e2b838d0f4.tar.gz
Bug 1309068 - Enable -Wshadow, r=franziskus
Diffstat (limited to 'cmd/pk12util')
-rw-r--r--cmd/pk12util/pk12util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/pk12util/pk12util.c b/cmd/pk12util/pk12util.c
index 70454a0d8..5884713e3 100644
--- a/cmd/pk12util/pk12util.c
+++ b/cmd/pk12util/pk12util.c
@@ -28,7 +28,7 @@ static PRBool pk12uForceUnicode;
PRIntn pk12uErrno = 0;
static void
-Usage(char *progName)
+Usage()
{
#define FPS PR_fprintf(PR_STDERR,
FPS "Usage: %s -i importfile [-d certdir] [-P dbprefix] [-h tokenname]\n",
@@ -1020,26 +1020,26 @@ main(int argc, char **argv)
rv = SECU_ParseCommandLine(argc, argv, progName, &pk12util);
if (rv != SECSuccess)
- Usage(progName);
+ Usage();
pk12_debugging = pk12util.options[opt_Debug].activated;
if ((pk12util.options[opt_Import].activated +
pk12util.options[opt_Export].activated +
pk12util.options[opt_List].activated) != 1) {
- Usage(progName);
+ Usage();
}
if (pk12util.options[opt_Export].activated &&
!pk12util.options[opt_Nickname].activated) {
- Usage(progName);
+ Usage();
}
rv = NSS_OptionGet(__NSS_PKCS12_DECODE_FORCE_UNICODE, &forceUnicode);
if (rv != SECSuccess) {
SECU_PrintError(progName,
"Failed to get NSS_PKCS12_DECODE_FORCE_UNICODE option");
- Usage(progName);
+ Usage();
}
pk12uForceUnicode = forceUnicode;
@@ -1144,7 +1144,7 @@ main(int argc, char **argv)
P12U_ListPKCS12File(import_file, slot, &slotPw, &p12FilePw);
} else {
- Usage(progName);
+ Usage();
pk12uErrno = PK12UERR_USAGE;
}