summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2006-11-14 19:41:04 +0000
committerderaadt <deraadt@openbsd.org>2006-11-14 19:41:04 +0000
commitce78b1c9634d0c1e457d424c3ba5837e130d7ffb (patch)
treed4f3513de08e3726dfbf9357f5018e72267c398a
parentmatch other architectures: _spinlock_lock_t is not volatile itself, but (diff)
downloadwireguard-openbsd-ce78b1c9634d0c1e457d424c3ba5837e130d7ffb.tar.xz
wireguard-openbsd-ce78b1c9634d0c1e457d424c3ba5837e130d7ffb.zip
use argc and argv not some made up short form
-rw-r--r--usr.bin/ssh/ssh-keygen.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index b566f7e3fcd..407ace2f7ab 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.155 2006/11/06 21:25:28 markus Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.156 2006/11/14 19:41:04 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1042,7 +1042,7 @@ usage(void)
* Main program for key management.
*/
int
-main(int ac, char **av)
+main(int argc, char **argv)
{
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2;
char out_file[MAXPATHLEN], *reader_id = NULL;
@@ -1065,7 +1065,7 @@ main(int ac, char **av)
sanitise_stdfd();
SSLeay_add_all_algorithms();
- log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
+ log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
/* we need this for the home * directory. */
pw = getpwuid(getuid());
@@ -1078,7 +1078,7 @@ main(int ac, char **av)
exit(1);
}
- while ((opt = getopt(ac, av,
+ while ((opt = getopt(argc, argv,
"degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
switch (opt) {
case 'b':
@@ -1211,9 +1211,9 @@ main(int ac, char **av)
}
/* reinit */
- log_init(av[0], log_level, SYSLOG_FACILITY_USER, 1);
+ log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1);
- if (optind < ac) {
+ if (optind < argc) {
printf("Too many arguments.\n");
usage();
}