diff options
| author | cheloha@openbsd.org <cheloha@openbsd.org> | 2022-12-04 23:50:49 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-12-09 11:36:12 +1100 |
| commit | b85c3581c16aaf6e83b9a797c80705a56b1f312e (patch) | |
| tree | 8b4b5be0b029b7629d0ddc43aabd3b62e882109d | |
| parent | 9a067e8d28a2249fd73f004961e30c113ee85e5d (diff) | |
| download | openssh-git-b85c3581c16aaf6e83b9a797c80705a56b1f312e.tar.gz | |
upstream: remove '?' from getopt(3) loops
userspace: remove vestigial '?' cases from top-level getopt(3) loops
getopt(3) returns '?' when it encounters a flag not present in the in
the optstring or if a flag is missing its option argument. We can
handle this case with the "default" failure case with no loss of
legibility. Hence, remove all the redundant "case '?':" lines.
Prompted by dlg@. With help from dlg@ and millert@.
Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2
ok naddy@ millert@ dlg@
OpenBSD-Commit-ID: b2f89346538ce4f5b33ab8011a23e0626a67e66e
| -rw-r--r-- | ssh-keygen.c | 3 | ||||
| -rw-r--r-- | ssh-keyscan.c | 3 | ||||
| -rw-r--r-- | sshd.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 5469037a..ae05440f 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.460 2022/11/07 04:04:40 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.461 2022/12/04 23:50:49 cheloha Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3544,7 +3544,6 @@ main(int argc, char **argv) else fatal("Unsupported moduli option %s", optarg); break; - case '?': default: usage(); } diff --git a/ssh-keyscan.c b/ssh-keyscan.c index a8ab932b..0d91df5c 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.147 2022/10/28 02:29:34 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.148 2022/12/04 23:50:49 cheloha Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -807,7 +807,6 @@ main(int argc, char **argv) case '6': IPv4or6 = AF_INET6; break; - case '?': default: usage(); } @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.592 2022/10/28 00:44:17 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.593 2022/12/04 23:50:49 cheloha Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1678,7 +1678,6 @@ main(int ac, char **av) exit(1); free(line); break; - case '?': default: usage(); break; |