From d7259957e8a5d4370d76bfccd4a30d5d1fe80f38 Mon Sep 17 00:00:00 2001 From: cheloha Date: Sun, 4 Dec 2022 23:50:45 +0000 Subject: [PATCH] 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@ --- bin/pax/options.c | 3 +-- games/robots/main.c | 3 +-- regress/lib/libc/db/dbtest.c | 3 +-- regress/lib/libc/regex/main.c | 3 +-- regress/lib/libpthread/switch/switch.c | 6 +++--- regress/lib/libutil/fmt_scaled/fmt_test.c | 3 +-- sbin/disklabel/disklabel.c | 3 +-- sbin/dmesg/dmesg.c | 3 +-- sbin/dumpfs/dumpfs.c | 3 +-- sbin/growfs/growfs.c | 4 +--- sbin/isakmpd/isakmpd.c | 3 +-- sbin/mount/mount.c | 3 +-- sbin/mount_cd9660/mount_cd9660.c | 3 +-- sbin/mount_ext2fs/mount_ext2fs.c | 3 +-- sbin/mount_ffs/mount_ffs.c | 3 +-- sbin/mount_msdos/mount_msdos.c | 3 +-- sbin/mount_tmpfs/mount_tmpfs.c | 3 +-- sbin/newfs/newfs.c | 3 +-- sbin/newfs_ext2fs/newfs_ext2fs.c | 3 +-- sbin/savecore/savecore.c | 3 +-- sbin/scsi/scsi.c | 3 +-- sbin/ttyflags/ttyflags.c | 3 +-- usr.bin/biff/biff.c | 3 +-- usr.bin/cal/cal.c | 3 +-- usr.bin/cap_mkdb/cap_mkdb.c | 3 +-- usr.bin/chpass/chpass.c | 3 +-- usr.bin/col/col.c | 3 +-- usr.bin/colrm/colrm.c | 3 +-- usr.bin/comm/comm.c | 3 +-- usr.bin/ctags/ctags.c | 3 +-- usr.bin/cut/cut.c | 3 +-- usr.bin/du/du.c | 3 +-- usr.bin/expand/expand.c | 3 +-- usr.bin/find/main.c | 3 +-- usr.bin/finger/finger.c | 3 +-- usr.bin/gencat/gencat.c | 3 +-- usr.bin/getconf/getconf.c | 3 +-- usr.bin/hexdump/hexsyntax.c | 4 ++-- usr.bin/id/id.c | 3 +-- usr.bin/join/join.c | 3 +-- usr.bin/lastcomm/lastcomm.c | 3 +-- usr.bin/logger/logger.c | 3 +-- usr.bin/look/look.c | 3 +-- usr.bin/m4/main.c | 4 ++-- usr.bin/make/main.c | 3 +-- usr.bin/mesg/mesg.c | 3 +-- usr.bin/netstat/main.c | 3 +-- usr.bin/nfsstat/nfsstat.c | 3 +-- usr.bin/nl/nl.c | 3 +-- usr.bin/nm/nm.c | 3 +-- usr.bin/paste/paste.c | 3 +-- usr.bin/rdist/rdist.c | 3 +-- usr.bin/rdistd/rdistd.c | 3 +-- usr.bin/sed/main.c | 3 +-- usr.bin/ssh/ssh-keygen.c | 3 +-- usr.bin/ssh/ssh-keyscan.c | 3 +-- usr.bin/ssh/sshd.c | 3 +-- usr.bin/tail/tail.c | 3 +-- usr.bin/telnet/main.c | 3 +-- usr.bin/tput/tput.c | 3 +-- usr.bin/tr/tr.c | 3 +-- usr.bin/tset/tset.c | 3 +-- usr.bin/tty/tty.c | 3 +-- usr.bin/unvis/unvis.c | 3 +-- usr.bin/usbhidaction/usbhidaction.c | 3 +-- usr.bin/usbhidctl/usbhid.c | 5 ++--- usr.bin/users/users.c | 3 +-- usr.bin/vis/vis.c | 3 +-- usr.bin/vmstat/vmstat.c | 3 +-- usr.bin/w/w.c | 3 +-- usr.bin/wc/wc.c | 3 +-- usr.bin/xargs/xargs.c | 5 ++--- usr.bin/xinstall/xinstall.c | 3 +-- usr.sbin/ac/ac.c | 1 - usr.sbin/apmd/apmd.c | 3 +-- usr.sbin/dev_mkdb/dev_mkdb.c | 3 +-- usr.sbin/fdformat/fdformat.c | 4 ++-- usr.sbin/hotplugd/hotplugd.c | 3 +-- usr.sbin/inetd/inetd.c | 3 +-- usr.sbin/iostat/iostat.c | 3 +-- usr.sbin/lpr/lpq/lpq.c | 3 +-- usr.sbin/makefs/makefs.c | 3 +-- usr.sbin/mtree/mtree.c | 3 +-- usr.sbin/netgroup_mkdb/netgroup_mkdb.c | 3 +-- usr.sbin/pwd_mkdb/pwd_mkdb.c | 3 +-- usr.sbin/rpc.lockd/lockd.c | 3 +-- usr.sbin/rpc.statd/statd.c | 3 +-- usr.sbin/sa/main.c | 3 +-- usr.sbin/wsconscfg/wsconscfg.c | 3 +-- usr.sbin/wsfontload/wsfontload.c | 3 +-- 90 files changed, 96 insertions(+), 183 deletions(-) diff --git a/bin/pax/options.c b/bin/pax/options.c index 5570873de15..ca53a1da048 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.103 2019/11/15 20:34:17 naddy Exp $ */ +/* $OpenBSD: options.c,v 1.104 2022/12/04 23:50:45 cheloha Exp $ */ /* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */ /*- @@ -1371,7 +1371,6 @@ cpio_options(int argc, char **argv) */ frmt = &(fsub[F_OCPIO]); break; - case '?': default: cpio_usage(); break; diff --git a/games/robots/main.c b/games/robots/main.c index 97b941f0da1..12d36bbc589 100644 --- a/games/robots/main.c +++ b/games/robots/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.30 2021/10/23 11:22:49 mestre Exp $ */ +/* $OpenBSD: main.c,v 1.31 2022/12/04 23:50:45 cheloha Exp $ */ /* $NetBSD: main.c,v 1.5 1995/04/22 10:08:54 cgd Exp $ */ /* @@ -93,7 +93,6 @@ main(int ac, char *av[]) case 't': Teleport = TRUE; break; - case '?': default: usage(); } diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c index fd1d2e80771..3207bafda38 100644 --- a/regress/lib/libc/db/dbtest.c +++ b/regress/lib/libc/db/dbtest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dbtest.c,v 1.20 2022/11/10 12:38:57 anton Exp $ */ +/* $OpenBSD: dbtest.c,v 1.21 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $ */ /*- @@ -107,7 +107,6 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; - case '?': default: usage(); } diff --git a/regress/lib/libc/regex/main.c b/regress/lib/libc/regex/main.c index 50c3f7589e0..4501e86b875 100644 --- a/regress/lib/libc/regex/main.c +++ b/regress/lib/libc/regex/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.11 2020/02/14 19:17:34 schwarze Exp $ */ +/* $OpenBSD: main.c,v 1.12 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $ */ #include @@ -61,7 +61,6 @@ main(int argc, char *argv[]) case 'x': /* Debugging. */ debug++; break; - case '?': default: errflg++; break; diff --git a/regress/lib/libpthread/switch/switch.c b/regress/lib/libpthread/switch/switch.c index 4f41f370b16..925235b4be3 100644 --- a/regress/lib/libpthread/switch/switch.c +++ b/regress/lib/libpthread/switch/switch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: switch.c,v 1.6 2018/05/21 10:14:50 bluhm Exp $ */ +/* $OpenBSD: switch.c,v 1.7 2022/12/04 23:50:46 cheloha Exp $ */ /* * Copyright (c) 1993, 1994, 1995, 1996 by Chris Provenzano and contributors, * proven@mit.edu All rights reserved. @@ -61,7 +61,7 @@ volatile int ending = 0; static __dead void usage(void) { - fprintf(stderr, "usage: %s [-?] [-c count]\n", getprogname()); + fprintf(stderr, "usage: %s [-c count]\n", getprogname()); fprintf(stderr, "count is number of theads, between 2 and 26\n"); exit(1); } @@ -89,7 +89,7 @@ main(int argc, char *argv[]) long i; const char *errstr; - while ((ch = getopt(argc, argv, "c:?")) != -1) { + while ((ch = getopt(argc, argv, "c:")) != -1) { switch (ch) { case 'c': count = strtonum(optarg, 2, 26, &errstr); diff --git a/regress/lib/libutil/fmt_scaled/fmt_test.c b/regress/lib/libutil/fmt_scaled/fmt_test.c index 308c2ce01fc..b6f1d69c42d 100644 --- a/regress/lib/libutil/fmt_scaled/fmt_test.c +++ b/regress/lib/libutil/fmt_scaled/fmt_test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fmt_test.c,v 1.18 2022/03/11 07:29:53 dtucker Exp $ */ +/* $OpenBSD: fmt_test.c,v 1.19 2022/12/04 23:50:46 cheloha Exp $ */ /* * Combined tests for fmt_scaled and scan_scaled. @@ -45,7 +45,6 @@ main(int argc, char **argv) break; case 'h': usage(0); - case '?': default: usage(1); } diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 9fec7daa9f7..45974d8ca46 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.245 2022/10/12 23:11:32 krw Exp $ */ +/* $OpenBSD: disklabel.c,v 1.246 2022/12/04 23:50:46 cheloha Exp $ */ /* * Copyright (c) 1987, 1993 @@ -186,7 +186,6 @@ main(int argc, char *argv[]) case 'v': verbose = 1; break; - case '?': default: usage(); } diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 1b4ef99e5b9..29fb0a8032d 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dmesg.c,v 1.32 2022/08/03 00:23:14 cheloha Exp $ */ +/* $OpenBSD: dmesg.c,v 1.33 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: dmesg.c,v 1.8 1995/03/18 14:54:49 cgd Exp $ */ /*- @@ -82,7 +82,6 @@ main(int argc, char *argv[]) case 'N': nlistf = optarg; break; - case '?': default: usage(); } diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 0f09598a232..ec6da9dd3d1 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumpfs.c,v 1.36 2020/06/20 07:49:04 otto Exp $ */ +/* $OpenBSD: dumpfs.c,v 1.37 2022/12/04 23:50:46 cheloha Exp $ */ /* * Copyright (c) 2002 Networks Associates Technology, Inc. @@ -89,7 +89,6 @@ main(int argc, char *argv[]) case 'm': domarshal = 1; break; - case '?': default: usage(); } diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index cdf1ac55352..73b849656bd 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: growfs.c,v 1.54 2020/06/20 07:49:04 otto Exp $ */ +/* $OpenBSD: growfs.c,v 1.55 2022/12/04 23:50:46 cheloha Exp $ */ /* * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz * Copyright (c) 1980, 1989, 1993 The Regents of the University of California. @@ -1735,8 +1735,6 @@ main(int argc, char **argv) case 'y': ExpertFlag = 1; break; - case '?': - /* FALLTHROUGH */ default: usage(); } diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c index d4cc5f73cf5..d0fa0da0b23 100644 --- a/sbin/isakmpd/isakmpd.c +++ b/sbin/isakmpd/isakmpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isakmpd.c,v 1.107 2018/01/15 09:54:48 mpi Exp $ */ +/* $OpenBSD: isakmpd.c,v 1.108 2022/12/04 23:50:46 cheloha Exp $ */ /* $EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $ */ /* @@ -212,7 +212,6 @@ parse_args(int argc, char *argv[]) verbose_logging = 1; break; - case '?': default: usage(); } diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index c3f4f581e32..b9805191148 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.75 2022/04/09 15:40:55 dv Exp $ */ +/* $OpenBSD: mount.c,v 1.76 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */ /* @@ -158,7 +158,6 @@ main(int argc, char * const argv[]) if (!hasopt(options, "rw")) options = catopt(options, "rw"); break; - case '?': default: usage(); } diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 2bc61f70f75..b35f35cce16 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_cd9660.c,v 1.22 2019/06/28 13:32:44 deraadt Exp $ */ +/* $OpenBSD: mount_cd9660.c,v 1.23 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $ */ /* @@ -91,7 +91,6 @@ main(int argc, char *argv[]) errx(1, "session number is %s: %s", errstr, optarg); break; - case '?': default: usage(); } diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c index 261cf151f50..3a57c010f43 100644 --- a/sbin/mount_ext2fs/mount_ext2fs.c +++ b/sbin/mount_ext2fs/mount_ext2fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ext2fs.c,v 1.19 2019/06/28 13:32:44 deraadt Exp $ */ +/* $OpenBSD: mount_ext2fs.c,v 1.20 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -65,7 +65,6 @@ main(int argc, char *argv[]) case 'o': getmntopts(optarg, mopts, &mntflags); break; - case '?': default: ext2fs_usage(); } diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c index b3915ee27b8..a531b2b1f3f 100644 --- a/sbin/mount_ffs/mount_ffs.c +++ b/sbin/mount_ffs/mount_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ffs.c,v 1.25 2019/06/28 13:32:44 deraadt Exp $ */ +/* $OpenBSD: mount_ffs.c,v 1.26 2022/12/04 23:50:46 cheloha Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -72,7 +72,6 @@ main(int argc, char *argv[]) case 'o': getmntopts(optarg, mopts, &mntflags); break; - case '?': default: ffs_usage(); } diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 08ae5cdf011..f6378cafebc 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_msdos.c,v 1.35 2022/08/20 07:03:24 tb Exp $ */ +/* $OpenBSD: mount_msdos.c,v 1.36 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */ /* @@ -97,7 +97,6 @@ main(int argc, char **argv) case 'o': getmntopts(optarg, mopts, &mntflags); break; - case '?': default: usage(); break; diff --git a/sbin/mount_tmpfs/mount_tmpfs.c b/sbin/mount_tmpfs/mount_tmpfs.c index 98d84f38fe4..64611b33674 100644 --- a/sbin/mount_tmpfs/mount_tmpfs.c +++ b/sbin/mount_tmpfs/mount_tmpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_tmpfs.c,v 1.7 2018/07/11 07:03:03 martijn Exp $ */ +/* $OpenBSD: mount_tmpfs.c,v 1.8 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: mount_tmpfs.c,v 1.24 2008/08/05 20:57:45 pooka Exp $ */ /* @@ -132,7 +132,6 @@ mount_tmpfs_parseargs(int argc, char *argv[], uidset = 1; break; - case '?': default: usage(); } diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 815b9b946ca..7ab691d78f0 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.116 2022/11/19 08:02:11 sthen Exp $ */ +/* $OpenBSD: newfs.c,v 1.117 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -310,7 +310,6 @@ main(int argc, char *argv[]) pop = optarg; break; #endif - case '?': default: usage(); } diff --git a/sbin/newfs_ext2fs/newfs_ext2fs.c b/sbin/newfs_ext2fs/newfs_ext2fs.c index 3017ec220cc..f7e48286f7c 100644 --- a/sbin/newfs_ext2fs/newfs_ext2fs.c +++ b/sbin/newfs_ext2fs/newfs_ext2fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs_ext2fs.c,v 1.28 2021/06/26 15:42:58 deraadt Exp $ */ +/* $OpenBSD: newfs_ext2fs.c,v 1.29 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: newfs_ext2fs.c,v 1.8 2009/03/02 10:38:13 tsutsui Exp $ */ /* @@ -212,7 +212,6 @@ main(int argc, char *argv[]) errx(EXIT_FAILURE, "Volume name cannot be zero length"); break; - case '?': default: usage(); } diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index d2f690ebfbd..afc223e5a08 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savecore.c,v 1.64 2022/03/25 16:14:55 tb Exp $ */ +/* $OpenBSD: savecore.c,v 1.65 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $ */ /*- @@ -154,7 +154,6 @@ main(int argc, char *argv[]) case 'z': zcompress = 1; break; - case '?': default: usage(); } diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c index b3861775794..7c58808cd26 100644 --- a/sbin/scsi/scsi.c +++ b/sbin/scsi/scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.c,v 1.31 2021/06/22 14:51:29 jmc Exp $ */ +/* $OpenBSD: scsi.c,v 1.32 2022/12/04 23:50:47 cheloha Exp $ */ /* $FreeBSD: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $ */ /* @@ -133,7 +133,6 @@ procargs(int *argc_p, char ***argv_p) case 'v': verbose = 1; break; - case '?': default: usage(); } diff --git a/sbin/ttyflags/ttyflags.c b/sbin/ttyflags/ttyflags.c index 252a0f5ebe6..e60dfb52f09 100644 --- a/sbin/ttyflags/ttyflags.c +++ b/sbin/ttyflags/ttyflags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ttyflags.c,v 1.16 2021/10/24 21:24:22 deraadt Exp $ */ +/* $OpenBSD: ttyflags.c,v 1.17 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: ttyflags.c,v 1.8 1996/04/09 05:20:30 cgd Exp $ */ /* @@ -78,7 +78,6 @@ main(int argc, char *argv[]) case 'v': vflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 231b3601ec5..8c21932b499 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biff.c,v 1.18 2021/07/12 15:09:19 beck Exp $ */ +/* $OpenBSD: biff.c,v 1.19 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $ */ /* @@ -51,7 +51,6 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { - case '?': default: usage(); } diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c index a4655bd579e..c37402dfd10 100644 --- a/usr.bin/cal/cal.c +++ b/usr.bin/cal/cal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cal.c,v 1.30 2015/10/09 01:37:06 deraadt Exp $ */ +/* $OpenBSD: cal.c,v 1.31 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $ */ /* @@ -168,7 +168,6 @@ main(int argc, char *argv[]) case 'y': yflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index 6fd874070cb..6787c469b11 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cap_mkdb.c,v 1.25 2020/09/15 07:41:38 kevlo Exp $ */ +/* $OpenBSD: cap_mkdb.c,v 1.26 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $ */ /*- @@ -87,7 +87,6 @@ main(int argc, char *argv[]) case 'v': verbose = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index 313270fb4b6..15a1262f40e 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.c,v 1.48 2021/10/24 21:24:16 deraadt Exp $ */ +/* $OpenBSD: chpass.c,v 1.49 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- @@ -84,7 +84,6 @@ main(int argc, char *argv[]) op = NEWSH; arg = optarg; break; - case '?': default: usage(); } diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index c3c51b4c630..3000ffbdeeb 100644 --- a/usr.bin/col/col.c +++ b/usr.bin/col/col.c @@ -1,4 +1,4 @@ -/* $OpenBSD: col.c,v 1.19 2015/10/09 01:37:06 deraadt Exp $ */ +/* $OpenBSD: col.c,v 1.20 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $ */ /*- @@ -139,7 +139,6 @@ main(int argc, char *argv[]) case 'x': /* do not compress spaces into tabs */ compress_spaces = 0; break; - case '?': default: usage(); } diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index d4fcfe7d3c8..f001982f0f2 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: colrm.c,v 1.13 2016/10/27 12:53:54 schwarze Exp $ */ +/* $OpenBSD: colrm.c,v 1.14 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $ */ /*- @@ -62,7 +62,6 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { - case '?': default: usage(); } diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index 73d19291d8b..35854885560 100644 --- a/usr.bin/comm/comm.c +++ b/usr.bin/comm/comm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comm.c,v 1.10 2015/10/09 01:37:07 deraadt Exp $ */ +/* $OpenBSD: comm.c,v 1.11 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: comm.c,v 1.10 1995/09/05 19:57:43 jtc Exp $ */ /* @@ -80,7 +80,6 @@ main(int argc, char *argv[]) case 'f': compare = strcasecmp; break; - case '?': default: usage(); } diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index 595219bfb31..762569b75c5 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctags.c,v 1.18 2015/10/09 01:37:07 deraadt Exp $ */ +/* $OpenBSD: ctags.c,v 1.19 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */ /* @@ -112,7 +112,6 @@ main(int argc, char *argv[]) case 'x': xflag = 1; break; - case '?': default: goto usage; } diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 162896d109e..214ee40bee9 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cut.c,v 1.26 2019/02/07 19:11:23 tobias Exp $ */ +/* $OpenBSD: cut.c,v 1.27 2022/12/04 23:50:47 cheloha Exp $ */ /* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */ /* @@ -104,7 +104,6 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index c26638257f5..3d68413a53c 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -1,4 +1,4 @@ -/* $OpenBSD: du.c,v 1.32 2016/08/24 03:13:45 guenther Exp $ */ +/* $OpenBSD: du.c,v 1.33 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */ /* @@ -116,7 +116,6 @@ main(int argc, char *argv[]) case 'x': ftsoptions |= FTS_XDEV; break; - case '?': default: usage(); } diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index 01d10ce2b1d..0d18abf6445 100644 --- a/usr.bin/expand/expand.c +++ b/usr.bin/expand/expand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expand.c,v 1.14 2015/10/09 01:37:07 deraadt Exp $ */ +/* $OpenBSD: expand.c,v 1.15 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $ */ /* @@ -66,7 +66,6 @@ main(int argc, char *argv[]) case 't': getstops(optarg); break; - case '?': default: usage(); /* NOTREACHED */ diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index a067221914e..b553da87530 100644 --- a/usr.bin/find/main.c +++ b/usr.bin/find/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.32 2021/10/24 21:24:16 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.33 2022/12/04 23:50:48 cheloha Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -99,7 +99,6 @@ main(int argc, char *argv[]) ftsoptions &= ~FTS_NOSTAT; ftsoptions |= FTS_XDEV; break; - case '?': default: usage(); } diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 3178b946ed8..11d5295c613 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: finger.c,v 1.27 2018/04/26 12:42:51 guenther Exp $ */ +/* $OpenBSD: finger.c,v 1.28 2022/12/04 23:50:48 cheloha Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -107,7 +107,6 @@ main(int argc, char *argv[]) case 'o': oflag = 1; /* office info */ break; - case '?': default: (void)fprintf(stderr, "usage: %s [-hlMmops] [login ...]\n", __progname); diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c index 9775de75aaf..92cb4d9a429 100644 --- a/usr.bin/gencat/gencat.c +++ b/usr.bin/gencat/gencat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencat.c,v 1.20 2019/07/25 13:53:57 schwarze Exp $ */ +/* $OpenBSD: gencat.c,v 1.21 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: gencat.c,v 1.9 1998/10/09 17:00:56 itohy Exp $ */ /*- @@ -139,7 +139,6 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, "")) != -1) { switch (c) { - case '?': default: usage(); /* NOTREACHED */ diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index c8645478b57..06e50d4a487 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getconf.c,v 1.22 2022/07/20 14:23:13 claudio Exp $ */ +/* $OpenBSD: getconf.c,v 1.23 2022/12/04 23:50:48 cheloha Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -420,7 +420,6 @@ main(int argc, char *argv[]) if (! compilation_spec_valid(optarg)) errx(1, "%s: unknown specification", optarg); break; - case '?': default: usage(); } diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c index 7f801b71763..0af873473cf 100644 --- a/usr.bin/hexdump/hexsyntax.c +++ b/usr.bin/hexdump/hexsyntax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hexsyntax.c,v 1.13 2016/03/15 04:19:13 mmcc Exp $ */ +/* $OpenBSD: hexsyntax.c,v 1.14 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: hexsyntax.c,v 1.8 1998/04/08 23:48:57 jeremy Exp $ */ /*- @@ -111,7 +111,7 @@ newsyntax(int argc, char ***argvp) add("\"%07.7_Ax\n\""); add("\"%07.7_ax \" 8/2 \" %04x \" \"\\n\""); break; - case '?': + default: usage(); } diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 5109f64b074..30e2c58e088 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: id.c,v 1.28 2017/05/30 15:29:53 tedu Exp $ */ +/* $OpenBSD: id.c,v 1.29 2022/12/04 23:50:48 cheloha Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -107,7 +107,6 @@ main(int argc, char *argv[]) case 'u': uflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 49bf617ce03..927924276e5 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -1,4 +1,4 @@ -/* $OpenBSD: join.c,v 1.33 2020/07/23 20:13:01 martijn Exp $ */ +/* $OpenBSD: join.c,v 1.34 2022/12/04 23:50:48 cheloha Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -187,7 +187,6 @@ main(int argc, char *argv[]) if (*end) errx(1, "illegal file number -- %s", optarg); break; - case '?': default: usage(); } diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index b9261145063..62d83e38bc3 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lastcomm.c,v 1.30 2021/12/13 16:37:37 deraadt Exp $ */ +/* $OpenBSD: lastcomm.c,v 1.31 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $ */ /* @@ -77,7 +77,6 @@ main(int argc, char *argv[]) case 'f': acctfile = optarg; break; - case '?': default: usage(); } diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c index 04500a9d4b8..bcb843ab88c 100644 --- a/usr.bin/logger/logger.c +++ b/usr.bin/logger/logger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logger.c,v 1.18 2019/06/17 00:23:03 guenther Exp $ */ +/* $OpenBSD: logger.c,v 1.19 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $ */ /* @@ -85,7 +85,6 @@ main(int argc, char *argv[]) case 't': /* tag */ tag = optarg; break; - case '?': default: usage(); } diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c index 0d64b7a3ecb..609530b1d7a 100644 --- a/usr.bin/look/look.c +++ b/usr.bin/look/look.c @@ -1,4 +1,4 @@ -/* $OpenBSD: look.c,v 1.26 2022/02/10 14:55:43 cheloha Exp $ */ +/* $OpenBSD: look.c,v 1.27 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */ /*- @@ -93,7 +93,6 @@ main(int argc, char *argv[]) case 't': termchar = *optarg; break; - case '?': default: usage(); } diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index f1b8fa5a55b..ef8ae2e42f5 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.87 2017/06/15 13:48:42 bcallah Exp $ */ +/* $OpenBSD: main.c,v 1.88 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */ /*- @@ -228,7 +228,7 @@ main(int argc, char *argv[]) case 'o': trace_file(optarg); break; - case '?': + default: usage(); } diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index c78ca82a2b2..645275d3985 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.127 2020/01/13 15:41:53 espie Exp $ */ +/* $OpenBSD: main.c,v 1.128 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $ */ /* @@ -170,7 +170,6 @@ posixParseOptLetter(int c) touchFlag = true; break; default: - case '?': usage(); } record_option(c, NULL); diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c index 0423eff7029..581a4b58f39 100644 --- a/usr.bin/mesg/mesg.c +++ b/usr.bin/mesg/mesg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mesg.c,v 1.17 2021/07/12 15:09:20 beck Exp $ */ +/* $OpenBSD: mesg.c,v 1.18 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: mesg.c,v 1.4 1994/12/23 07:16:32 jtc Exp $ */ /* @@ -54,7 +54,6 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { - case '?': default: goto usage; } diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index b168bc5855e..85cf5de1c15 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.122 2022/09/08 13:18:47 kn Exp $ */ +/* $OpenBSD: main.c,v 1.123 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $ */ /* @@ -284,7 +284,6 @@ main(int argc, char *argv[]) errx(1, "interval is %s", errstr); iflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index ba9cf2fde5a..4ad8b4de035 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsstat.c,v 1.36 2016/08/27 04:07:42 guenther Exp $ */ +/* $OpenBSD: nfsstat.c,v 1.37 2022/12/04 23:50:49 cheloha Exp $ */ /* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */ /* @@ -106,7 +106,6 @@ main(int argc, char *argv[]) case 'c': display = SHOW_CLIENT; break; - case '?': default: usage(); } diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index 0edfd359092..a65de461680 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nl.c,v 1.7 2019/04/21 01:08:46 deraadt Exp $ */ +/* $OpenBSD: nl.c,v 1.8 2022/12/04 23:50:49 cheloha Exp $ */ /* $NetBSD: nl.c,v 1.11 2011/08/16 12:00:46 christos Exp $ */ /*- @@ -196,7 +196,6 @@ main(int argc, char *argv[]) errx(EXIT_FAILURE, "width is %s: %s", errstr, optarg); break; - case '?': default: usage(); /* NOTREACHED */ diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c index 319273dd5e0..de22013b240 100644 --- a/usr.bin/nm/nm.c +++ b/usr.bin/nm/nm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nm.c,v 1.54 2019/03/03 16:07:39 schwarze Exp $ */ +/* $OpenBSD: nm.c,v 1.55 2022/12/04 23:50:49 cheloha Exp $ */ /* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */ /* @@ -206,7 +206,6 @@ main(int argc, char *argv[]) usage(); } break; - case '?': default: usage(); } diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 77c9f328755..a6c015f8695 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: paste.c,v 1.26 2018/08/04 19:19:37 schwarze Exp $ */ +/* $OpenBSD: paste.c,v 1.27 2022/12/04 23:50:49 cheloha Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -69,7 +69,6 @@ main(int argc, char *argv[]) case 's': seq = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c index 4003ff6ee16..9f7396e6043 100644 --- a/usr.bin/rdist/rdist.c +++ b/usr.bin/rdist/rdist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdist.c,v 1.32 2021/06/22 20:19:28 jmc Exp $ */ +/* $OpenBSD: rdist.c,v 1.33 2022/12/04 23:50:49 cheloha Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -248,7 +248,6 @@ main(int argc, char **argv, char **envp) case 'i': FLAG_ON(options, DO_IGNLNKS); break; case 'x': FLAG_ON(options, DO_NOEXEC); break; - case '?': default: usage(); } diff --git a/usr.bin/rdistd/rdistd.c b/usr.bin/rdistd/rdistd.c index d539d3e0109..90d9078d0e6 100644 --- a/usr.bin/rdistd/rdistd.c +++ b/usr.bin/rdistd/rdistd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdistd.c,v 1.10 2015/02/08 23:40:34 deraadt Exp $ */ +/* $OpenBSD: rdistd.c,v 1.11 2022/12/04 23:50:49 cheloha Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -79,7 +79,6 @@ main(int argc, char **argv, char **envp) printf("%s\n", getversion()); exit(0); - case '?': default: error("Bad command line option."); usage(); diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 42179376c0c..db4bf3c1e03 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.42 2021/01/31 14:23:05 naddy Exp $ */ +/* $OpenBSD: main.c,v 1.43 2022/12/04 23:50:49 cheloha Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -143,7 +143,6 @@ main(int argc, char *argv[]) setvbuf(stdout, NULL, _IOLBF, 0); break; default: - case '?': (void)fprintf(stderr, "usage: sed [-aEnru] [-i[extension]] command [file ...]\n" " sed [-aEnru] [-e command] [-f command_file] [-i[extension]] [file ...]\n"); diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 6db50b7aaa3..869b6758885 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.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 * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -3520,7 +3520,6 @@ main(int argc, char **argv) else fatal("Unsupported moduli option %s", optarg); break; - case '?': default: usage(); } diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 6794b157e13..526c1362ca6 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/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 . * @@ -785,7 +785,6 @@ main(int argc, char **argv) case '6': IPv4or6 = AF_INET6; break; - case '?': default: usage(); } diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 45c739329ff..fd096dc7723 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1580,7 +1580,6 @@ main(int ac, char **av) exit(1); free(line); break; - case '?': default: usage(); break; diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index ed79fd45a31..a753d3a17e3 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tail.c,v 1.23 2021/12/23 23:23:42 jsg Exp $ */ +/* $OpenBSD: tail.c,v 1.24 2022/12/04 23:50:49 cheloha Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -114,7 +114,6 @@ main(int argc, char *argv[]) case 'r': rflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index b2972ba8e9d..42c45cce3f7 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.36 2015/12/06 12:00:16 tobias Exp $ */ +/* $OpenBSD: main.c,v 1.37 2022/12/04 23:50:49 cheloha Exp $ */ /* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */ /* @@ -155,7 +155,6 @@ main(int argc, char *argv[]) prompt, errstr, optarg); } break; - case '?': default: usage(); } diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c index 774765ed281..2fef16cc274 100644 --- a/usr.bin/tput/tput.c +++ b/usr.bin/tput/tput.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tput.c,v 1.24 2019/01/25 00:19:27 millert Exp $ */ +/* $OpenBSD: tput.c,v 1.25 2022/12/04 23:50:49 cheloha Exp $ */ /* * Copyright (c) 1999 Todd C. Miller @@ -90,7 +90,6 @@ main(int argc, char *argv[]) case 'S': Sflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 370407194e3..ab78898a986 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tr.c,v 1.21 2022/02/11 16:09:21 cheloha Exp $ */ +/* $OpenBSD: tr.c,v 1.22 2022/12/04 23:50:49 cheloha Exp $ */ /* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */ /* @@ -104,7 +104,6 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index 1ea5f876747..fe4440fb8dc 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tset.c,v 1.43 2021/06/22 18:33:48 tb Exp $ */ +/* $OpenBSD: tset.c,v 1.44 2022/12/04 23:50:49 cheloha Exp $ */ /**************************************************************************** * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * @@ -1176,7 +1176,6 @@ main(int argc, char **argv) case 'w': /* set window-size */ opt_w = TRUE; break; - case '?': default: usage(); } diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c index d1ba54b5fa8..14beca8e931 100644 --- a/usr.bin/tty/tty.c +++ b/usr.bin/tty/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.12 2021/07/12 15:09:20 beck Exp $ */ +/* $OpenBSD: tty.c,v 1.13 2022/12/04 23:50:50 cheloha Exp $ */ /* $NetBSD: tty.c,v 1.4 1994/12/07 00:46:57 jtc Exp $ */ /* @@ -50,7 +50,6 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; - case '?': default: usage(); /* NOTREACHED */ diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c index 22566d97512..3841ed9020c 100644 --- a/usr.bin/unvis/unvis.c +++ b/usr.bin/unvis/unvis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unvis.c,v 1.14 2015/10/09 01:37:09 deraadt Exp $ */ +/* $OpenBSD: unvis.c,v 1.15 2022/12/04 23:50:50 cheloha Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -48,7 +48,6 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { - case '?': default: (void) fprintf(stderr, "usage: unvis [file ...]\n"); exit(1); diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index 995b673b2b5..bbfa8f641a8 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbhidaction.c,v 1.25 2022/08/02 09:07:34 mestre Exp $ */ +/* $OpenBSD: usbhidaction.c,v 1.26 2022/12/04 23:50:50 cheloha Exp $ */ /* $NetBSD: usbhidaction.c,v 1.7 2002/01/18 14:38:59 augustss Exp $ */ /* @@ -111,7 +111,6 @@ main(int argc, char **argv) demon = 0; verbose++; break; - case '?': default: usage(); } diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c index 1560bb365d4..8bcfd17c80b 100644 --- a/usr.bin/usbhidctl/usbhid.c +++ b/usr.bin/usbhidctl/usbhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbhid.c,v 1.18 2021/12/15 11:21:35 mestre Exp $ */ +/* $OpenBSD: usbhid.c,v 1.19 2022/12/04 23:50:50 cheloha Exp $ */ /* $NetBSD: usbhid.c,v 1.22 2002/02/20 20:30:42 christos Exp $ */ /* @@ -776,7 +776,7 @@ main(int argc, char **argv) wflag = aflag = nflag = verbose = rflag = Rflag = lflag = 0; dev = NULL; table = NULL; - while ((ch = getopt(argc, argv, "?af:lnRrt:vw")) != -1) { + while ((ch = getopt(argc, argv, "af:lnRrt:vw")) != -1) { switch (ch) { case 'a': aflag = 1; @@ -805,7 +805,6 @@ main(int argc, char **argv) case 'w': wflag = 1; break; - case '?': default: usage(); /* NOTREACHED */ diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c index 2d7dc326819..b618c2623e5 100644 --- a/usr.bin/users/users.c +++ b/usr.bin/users/users.c @@ -1,4 +1,4 @@ -/* $OpenBSD: users.c,v 1.15 2021/07/12 15:09:20 beck Exp $ */ +/* $OpenBSD: users.c,v 1.16 2022/12/04 23:50:48 cheloha Exp $ */ /* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */ /* @@ -60,7 +60,6 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { - case '?': default: (void)fprintf(stderr, "usage: users\n"); exit(1); diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c index 56c25a5b625..c114d7be15f 100644 --- a/usr.bin/vis/vis.c +++ b/usr.bin/vis/vis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vis.c,v 1.21 2020/08/03 01:08:37 deraadt Exp $ */ +/* $OpenBSD: vis.c,v 1.22 2022/12/04 23:50:50 cheloha Exp $ */ /* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */ /*- @@ -102,7 +102,6 @@ main(int argc, char *argv[]) debug = 1; break; #endif - case '?': default: usage(); } diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 9b5c12c3989..870bc9f5d43 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1,5 +1,5 @@ /* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */ -/* $OpenBSD: vmstat.c,v 1.154 2022/07/26 14:49:13 visa Exp $ */ +/* $OpenBSD: vmstat.c,v 1.155 2022/12/04 23:50:50 cheloha Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -172,7 +172,6 @@ main(int argc, char *argv[]) case 'z': zflag = 1; break; - case '?': default: usage(); } diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 92afe2c2dd0..c21c0b6a362 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -1,4 +1,4 @@ -/* $OpenBSD: w.c,v 1.67 2022/02/22 17:35:01 deraadt Exp $ */ +/* $OpenBSD: w.c,v 1.68 2022/12/04 23:50:50 cheloha Exp $ */ /*- * Copyright (c) 1980, 1991, 1993, 1994 @@ -148,7 +148,6 @@ main(int argc, char *argv[]) case 'f': case 'l': case 's': case 'u': case 'w': warnx("[-flsuw] no longer supported"); /* FALLTHROUGH */ - case '?': default: usage(wcmd); } diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 0e1e4856827..e6877f0cbec 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wc.c,v 1.30 2022/09/02 15:21:40 cheloha Exp $ */ +/* $OpenBSD: wc.c,v 1.31 2022/12/04 23:50:50 cheloha Exp $ */ /* * Copyright (c) 1980, 1987, 1991, 1993 @@ -81,7 +81,6 @@ main(int argc, char *argv[]) case 'h': humanchar = 1; break; - case '?': default: fprintf(stderr, "usage: %s [-c | -m] [-hlw] [file ...]\n", diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index a7c5c89988b..ff17caaf436 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xargs.c,v 1.35 2020/07/19 13:19:25 schwarze Exp $ */ +/* $OpenBSD: xargs.c,v 1.36 2022/12/04 23:50:50 cheloha Exp $ */ /* $FreeBSD: xargs.c,v 1.51 2003/05/03 19:09:11 obrien Exp $ */ /*- @@ -169,10 +169,9 @@ main(int argc, char *argv[]) case '0': zflag = 1; break; - case '?': default: usage(); - } + } argc -= optind; argv += optind; diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index db534bc74be..6183347f22c 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xinstall.c,v 1.76 2021/11/28 19:28:42 deraadt Exp $ */ +/* $OpenBSD: xinstall.c,v 1.77 2022/12/04 23:50:50 cheloha Exp $ */ /* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */ /* @@ -140,7 +140,6 @@ main(int argc, char *argv[]) case 'd': dodir = 1; break; - case '?': default: usage(); } diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index ed4f7ebefd8..e39b316ebba 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -223,7 +223,6 @@ main(int argc, char *argv[]) case 'w': fp = file(optarg); break; - case '?': default: usage(); break; diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c index 231d504cf09..06fa3796d2e 100644 --- a/usr.sbin/apmd/apmd.c +++ b/usr.sbin/apmd/apmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apmd.c,v 1.109 2022/02/18 22:54:13 deraadt Exp $ */ +/* $OpenBSD: apmd.c,v 1.110 2022/12/04 23:50:50 cheloha Exp $ */ /* * Copyright (c) 1995, 1996 John T. Kohl @@ -480,7 +480,6 @@ main(int argc, char *argv[]) errx(1, "battery percentage is %s: %s", errstr, optarg); break; - case '?': default: usage(); } diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c index 9bad52a8463..c88418f821a 100644 --- a/usr.sbin/dev_mkdb/dev_mkdb.c +++ b/usr.sbin/dev_mkdb/dev_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_mkdb.c,v 1.18 2021/07/12 15:09:20 beck Exp $ */ +/* $OpenBSD: dev_mkdb.c,v 1.19 2022/12/04 23:50:50 cheloha Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -75,7 +75,6 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { - case '?': default: usage(); } diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c index 2b1603c3779..556e68528f2 100644 --- a/usr.sbin/fdformat/fdformat.c +++ b/usr.sbin/fdformat/fdformat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdformat.c,v 1.24 2019/06/28 13:32:47 deraadt Exp $ */ +/* $OpenBSD: fdformat.c,v 1.25 2022/12/04 23:50:50 cheloha Exp $ */ /* * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden @@ -236,7 +236,7 @@ main(int argc, char *argv[]) verify_only = 1; break; - case '?': default: + default: usage(); } diff --git a/usr.sbin/hotplugd/hotplugd.c b/usr.sbin/hotplugd/hotplugd.c index 9d9aa9647d6..df93ff77897 100644 --- a/usr.sbin/hotplugd/hotplugd.c +++ b/usr.sbin/hotplugd/hotplugd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hotplugd.c,v 1.17 2021/07/12 15:09:21 beck Exp $ */ +/* $OpenBSD: hotplugd.c,v 1.18 2022/12/04 23:50:50 cheloha Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko * @@ -67,7 +67,6 @@ main(int argc, char *argv[]) case 'd': device = optarg; break; - case '?': default: usage(); /* NOTREACHED */ diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 2c623ef66d1..bffe64b691c 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inetd.c,v 1.162 2020/12/30 18:41:06 benno Exp $ */ +/* $OpenBSD: inetd.c,v 1.163 2022/12/04 23:50:50 cheloha Exp $ */ /* * Copyright (c) 1983,1991 The Regents of the University of California. @@ -314,7 +314,6 @@ main(int argc, char *argv[]) optarg); break; } - case '?': default: fprintf(stderr, "usage: inetd [-d] [-R rate] [configuration_file]\n"); diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 8d32151fe01..e8c1b96ac8e 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iostat.c,v 1.44 2021/07/12 15:09:21 beck Exp $ */ +/* $OpenBSD: iostat.c,v 1.45 2022/12/04 23:50:51 cheloha Exp $ */ /* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */ /* @@ -150,7 +150,6 @@ main(int argc, char *argv[]) if (errstr) errx(1, "wait is %s", errstr); break; - case '?': default: usage(); } diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c index 94ddd180164..c4c228b85cb 100644 --- a/usr.sbin/lpr/lpq/lpq.c +++ b/usr.sbin/lpr/lpq/lpq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpq.c,v 1.23 2016/02/29 17:26:02 jca Exp $ */ +/* $OpenBSD: lpq.c,v 1.24 2022/12/04 23:50:51 cheloha Exp $ */ /* $NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $ */ /* @@ -104,7 +104,6 @@ main(int argc, char **argv) if (wait_time < 30) warnx("warning: wait time less than 30 seconds"); break; - case '?': default: usage(); } diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c index 75e71c8c28b..af39605d996 100644 --- a/usr.sbin/makefs/makefs.c +++ b/usr.sbin/makefs/makefs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: makefs.c,v 1.21 2021/07/12 15:09:21 beck Exp $ */ +/* $OpenBSD: makefs.c,v 1.22 2022/12/04 23:50:51 cheloha Exp $ */ /* $NetBSD: makefs.c,v 1.53 2015/11/27 15:10:32 joerg Exp $ */ /* @@ -187,7 +187,6 @@ main(int argc, char *argv[]) stampts = get_tstamp(optarg); break; - case '?': default: usage(); } diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index fbfa797750a..b7e5094d2b9 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtree.c,v 1.27 2021/11/15 15:14:24 millert Exp $ */ +/* $OpenBSD: mtree.c,v 1.28 2022/12/04 23:50:51 cheloha Exp $ */ /* $NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $ */ /*- @@ -124,7 +124,6 @@ main(int argc, char *argv[]) case 'x': ftsoptions |= FTS_XDEV; break; - case '?': default: usage(); } diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c index 1420eec0beb..cb5832b0d1a 100644 --- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c +++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netgroup_mkdb.c,v 1.22 2019/06/28 14:20:40 schwarze Exp $ */ +/* $OpenBSD: netgroup_mkdb.c,v 1.23 2022/12/04 23:50:51 cheloha Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -110,7 +110,6 @@ main(int argc, char *argv[]) dbname = optarg; break; - case '?': default: usage(); } diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index e23405b41c7..d2a55325908 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.c +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd_mkdb.c,v 1.59 2021/11/28 19:28:42 deraadt Exp $ */ +/* $OpenBSD: pwd_mkdb.c,v 1.60 2022/12/04 23:50:51 cheloha Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -135,7 +135,6 @@ main(int argc, char **argv) break; case 'v': /* backward compatible */ break; - case '?': default: usage(); } diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c index 4b7397e3fd5..a3ff649e2db 100644 --- a/usr.sbin/rpc.lockd/lockd.c +++ b/usr.sbin/rpc.lockd/lockd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lockd.c,v 1.14 2015/04/18 18:28:38 deraadt Exp $ */ +/* $OpenBSD: lockd.c,v 1.15 2022/12/04 23:50:51 cheloha Exp $ */ /* * Copyright (c) 1995 @@ -91,7 +91,6 @@ main(int argc, char *argv[]) } break; default: - case '?': usage(); /* NOTREACHED */ } diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c index 46bc1343513..fd9a3df09ea 100644 --- a/usr.sbin/rpc.statd/statd.c +++ b/usr.sbin/rpc.statd/statd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: statd.c,v 1.4 2017/01/21 08:33:51 krw Exp $ */ +/* $OpenBSD: statd.c,v 1.5 2022/12/04 23:50:51 cheloha Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -97,7 +97,6 @@ main(int argc, char **argv) debug = 1; break; default: - case '?': fprintf(stderr, "usage: %s [-d]\n", __progname); exit(1); /* NOTREACHED */ diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index fa7cb2fde79..eb30ae0a5dc 100644 --- a/usr.sbin/sa/main.c +++ b/usr.sbin/sa/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.18 2022/02/22 17:22:29 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.19 2022/12/04 23:50:51 cheloha Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou * All rights reserved. @@ -164,7 +164,6 @@ main(int argc, char **argv) if (errstr) errx(1, "-v %s: %s", optarg, errstr); break; - case '?': default: (void)fprintf(stderr, "usage: %s [-abcDdfijKklmnqrstu] [-v cutoff]" diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c index 8c12221bb1e..4b52025e312 100644 --- a/usr.sbin/wsconscfg/wsconscfg.c +++ b/usr.sbin/wsconscfg/wsconscfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconscfg.c,v 1.17 2021/10/24 21:24:19 deraadt Exp $ */ +/* $OpenBSD: wsconscfg.c,v 1.18 2022/12/04 23:50:51 cheloha Exp $ */ /* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */ /* @@ -98,7 +98,6 @@ main(int argc, char *argv[]) case 'F': dsd.flags |= WSDISPLAY_DELSCR_FORCE; break; - case '?': default: usage(); break; diff --git a/usr.sbin/wsfontload/wsfontload.c b/usr.sbin/wsfontload/wsfontload.c index c9605a80dc1..c933ef436e1 100644 --- a/usr.sbin/wsfontload/wsfontload.c +++ b/usr.sbin/wsfontload/wsfontload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfontload.c,v 1.25 2021/10/25 19:54:29 kn Exp $ */ +/* $OpenBSD: wsfontload.c,v 1.26 2022/12/04 23:50:51 cheloha Exp $ */ /* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */ /* @@ -121,7 +121,6 @@ main(int argc, char *argv[]) case 'B': f.byteorder = WSDISPLAY_FONTORDER_R2L; break; - case '?': default: usage(); break; -- 2.20.1