On Sat, Dec 03, 2022 at 08:14:37PM -0600, Scott Cheloha wrote:
> There are nearly a hundred vestigial question mark cases in the
> top-level getopt(3) loops of various programs.  You know, this:
> 
>       switch (ch) {
>       /* ... */
>       case '?':
>       default:
>               usage();
>       }
> 
> All of them are redundant and can be handled by the "default" case,
> which invariably fails the program.
> 
> This patch covers bin, games, regress, sbin, usr.bin, and usr.sbin.  I
> excluded the csh(1)/ksh(1) builtins.  I also excluded nsd and unbound;
> they don't look domestic.  gnu is also not domestic and is excluded.
> 
> ok?

mostly ok. can md5.c keep the switch statement and use default instead
of case '?'? everything else looks good.

dlg

> 
> Index: bin/md5/md5.c
> ===================================================================
> RCS file: /cvs/src/bin/md5/md5.c,v
> retrieving revision 1.97
> diff -u -p -r1.97 md5.c
> --- bin/md5/md5.c     19 Oct 2020 18:15:18 -0000      1.97
> +++ bin/md5/md5.c     4 Dec 2022 02:09:57 -0000
> @@ -230,13 +230,8 @@ main(int argc, char **argv)
>  
>       /* Check for -b option early since it changes behavior. */
>       while ((fl = getopt(argc, argv, optstr)) != -1) {
> -             switch (fl) {
> -             case 'b':
> +             if (fl == 'b')
>                       bflag = 1;
> -                     break;
> -             case '?':
> -                     usage();
> -             }
>       }
>       optind = 1;
>       optreset = 1;
> Index: bin/pax/options.c
> ===================================================================
> RCS file: /cvs/src/bin/pax/options.c,v
> retrieving revision 1.103
> diff -u -p -r1.103 options.c
> --- bin/pax/options.c 15 Nov 2019 20:34:17 -0000      1.103
> +++ bin/pax/options.c 4 Dec 2022 02:09:57 -0000
> @@ -1371,7 +1371,6 @@ cpio_options(int argc, char **argv)
>                                */
>                               frmt = &(fsub[F_OCPIO]);
>                               break;
> -                     case '?':
>                       default:
>                               cpio_usage();
>                               break;
> Index: games/robots/main.c
> ===================================================================
> RCS file: /cvs/src/games/robots/main.c,v
> retrieving revision 1.30
> diff -u -p -r1.30 main.c
> --- games/robots/main.c       23 Oct 2021 11:22:49 -0000      1.30
> +++ games/robots/main.c       4 Dec 2022 02:09:57 -0000
> @@ -93,7 +93,6 @@ main(int ac, char *av[])
>               case 't':
>                       Teleport = TRUE;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: regress/lib/libpthread/switch/switch.c
> ===================================================================
> RCS file: /cvs/src/regress/lib/libpthread/switch/switch.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 switch.c
> --- regress/lib/libpthread/switch/switch.c    21 May 2018 10:14:50 -0000      
> 1.6
> +++ regress/lib/libpthread/switch/switch.c    4 Dec 2022 02:09:57 -0000
> @@ -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);
> Index: regress/lib/libc/db/dbtest.c
> ===================================================================
> RCS file: /cvs/src/regress/lib/libc/db/dbtest.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 dbtest.c
> --- regress/lib/libc/db/dbtest.c      10 Nov 2022 12:38:57 -0000      1.20
> +++ regress/lib/libc/db/dbtest.c      4 Dec 2022 02:09:58 -0000
> @@ -107,7 +107,6 @@ main(int argc, char *argv[])
>               case 's':
>                       sflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: regress/lib/libc/regex/main.c
> ===================================================================
> RCS file: /cvs/src/regress/lib/libc/regex/main.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 main.c
> --- regress/lib/libc/regex/main.c     14 Feb 2020 19:17:34 -0000      1.11
> +++ regress/lib/libc/regex/main.c     4 Dec 2022 02:09:58 -0000
> @@ -61,7 +61,6 @@ main(int argc, char *argv[])
>               case 'x':       /* Debugging. */
>                       debug++;
>                       break;
> -             case '?':
>               default:
>                       errflg++;
>                       break;
> Index: regress/lib/libutil/fmt_scaled/fmt_test.c
> ===================================================================
> RCS file: /cvs/src/regress/lib/libutil/fmt_scaled/fmt_test.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 fmt_test.c
> --- regress/lib/libutil/fmt_scaled/fmt_test.c 11 Mar 2022 07:29:53 -0000      
> 1.18
> +++ regress/lib/libutil/fmt_scaled/fmt_test.c 4 Dec 2022 02:09:58 -0000
> @@ -45,7 +45,6 @@ main(int argc, char **argv)
>                                       break;
>                       case 'h':
>                                       usage(0);
> -                     case '?':
>                       default:
>                                       usage(1);
>                       }
> Index: sbin/disklabel/disklabel.c
> ===================================================================
> RCS file: /cvs/src/sbin/disklabel/disklabel.c,v
> retrieving revision 1.245
> diff -u -p -r1.245 disklabel.c
> --- sbin/disklabel/disklabel.c        12 Oct 2022 23:11:32 -0000      1.245
> +++ sbin/disklabel/disklabel.c        4 Dec 2022 02:09:59 -0000
> @@ -186,7 +186,6 @@ main(int argc, char *argv[])
>               case 'v':
>                       verbose = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/dmesg/dmesg.c
> ===================================================================
> RCS file: /cvs/src/sbin/dmesg/dmesg.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 dmesg.c
> --- sbin/dmesg/dmesg.c        3 Aug 2022 00:23:14 -0000       1.32
> +++ sbin/dmesg/dmesg.c        4 Dec 2022 02:09:59 -0000
> @@ -82,7 +82,6 @@ main(int argc, char *argv[])
>               case 'N':
>                       nlistf = optarg;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/dumpfs/dumpfs.c
> ===================================================================
> RCS file: /cvs/src/sbin/dumpfs/dumpfs.c,v
> retrieving revision 1.36
> diff -u -p -r1.36 dumpfs.c
> --- sbin/dumpfs/dumpfs.c      20 Jun 2020 07:49:04 -0000      1.36
> +++ sbin/dumpfs/dumpfs.c      4 Dec 2022 02:09:59 -0000
> @@ -89,7 +89,6 @@ main(int argc, char *argv[])
>               case 'm':
>                       domarshal = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/growfs/growfs.c
> ===================================================================
> RCS file: /cvs/src/sbin/growfs/growfs.c,v
> retrieving revision 1.54
> diff -u -p -r1.54 growfs.c
> --- sbin/growfs/growfs.c      20 Jun 2020 07:49:04 -0000      1.54
> +++ sbin/growfs/growfs.c      4 Dec 2022 02:09:59 -0000
> @@ -1735,8 +1735,6 @@ main(int argc, char **argv)
>               case 'y':
>                       ExpertFlag = 1;
>                       break;
> -             case '?':
> -                     /* FALLTHROUGH */
>               default:
>                       usage();
>               }
> Index: sbin/isakmpd/isakmpd.c
> ===================================================================
> RCS file: /cvs/src/sbin/isakmpd/isakmpd.c,v
> retrieving revision 1.107
> diff -u -p -r1.107 isakmpd.c
> --- sbin/isakmpd/isakmpd.c    15 Jan 2018 09:54:48 -0000      1.107
> +++ sbin/isakmpd/isakmpd.c    4 Dec 2022 02:09:59 -0000
> @@ -212,7 +212,6 @@ parse_args(int argc, char *argv[])
>                       verbose_logging = 1;
>                       break;
>  
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/mount/mount.c
> ===================================================================
> RCS file: /cvs/src/sbin/mount/mount.c,v
> retrieving revision 1.75
> diff -u -p -r1.75 mount.c
> --- sbin/mount/mount.c        9 Apr 2022 15:40:55 -0000       1.75
> +++ sbin/mount/mount.c        4 Dec 2022 02:10:00 -0000
> @@ -158,7 +158,6 @@ main(int argc, char * const argv[])
>                       if (!hasopt(options, "rw"))
>                               options = catopt(options, "rw");
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/mount_cd9660/mount_cd9660.c
> ===================================================================
> RCS file: /cvs/src/sbin/mount_cd9660/mount_cd9660.c,v
> retrieving revision 1.22
> diff -u -p -r1.22 mount_cd9660.c
> --- sbin/mount_cd9660/mount_cd9660.c  28 Jun 2019 13:32:44 -0000      1.22
> +++ sbin/mount_cd9660/mount_cd9660.c  4 Dec 2022 02:10:00 -0000
> @@ -91,7 +91,6 @@ main(int argc, char *argv[])
>                               errx(1, "session number is %s: %s", errstr,
>                                   optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/mount_ext2fs/mount_ext2fs.c
> ===================================================================
> RCS file: /cvs/src/sbin/mount_ext2fs/mount_ext2fs.c,v
> retrieving revision 1.19
> diff -u -p -r1.19 mount_ext2fs.c
> --- sbin/mount_ext2fs/mount_ext2fs.c  28 Jun 2019 13:32:44 -0000      1.19
> +++ sbin/mount_ext2fs/mount_ext2fs.c  4 Dec 2022 02:10:00 -0000
> @@ -65,7 +65,6 @@ main(int argc, char *argv[])
>               case 'o':
>                       getmntopts(optarg, mopts, &mntflags);
>                       break;
> -             case '?':
>               default:
>                       ext2fs_usage();
>               }
> Index: sbin/mount_ffs/mount_ffs.c
> ===================================================================
> RCS file: /cvs/src/sbin/mount_ffs/mount_ffs.c,v
> retrieving revision 1.25
> diff -u -p -r1.25 mount_ffs.c
> --- sbin/mount_ffs/mount_ffs.c        28 Jun 2019 13:32:44 -0000      1.25
> +++ sbin/mount_ffs/mount_ffs.c        4 Dec 2022 02:10:00 -0000
> @@ -72,7 +72,6 @@ main(int argc, char *argv[])
>               case 'o':
>                       getmntopts(optarg, mopts, &mntflags);
>                       break;
> -             case '?':
>               default:
>                       ffs_usage();
>               }
> Index: sbin/mount_msdos/mount_msdos.c
> ===================================================================
> RCS file: /cvs/src/sbin/mount_msdos/mount_msdos.c,v
> retrieving revision 1.35
> diff -u -p -r1.35 mount_msdos.c
> --- sbin/mount_msdos/mount_msdos.c    20 Aug 2022 07:03:24 -0000      1.35
> +++ sbin/mount_msdos/mount_msdos.c    4 Dec 2022 02:10:00 -0000
> @@ -97,7 +97,6 @@ main(int argc, char **argv)
>               case 'o':
>                       getmntopts(optarg, mopts, &mntflags);
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       break;
> Index: sbin/mount_tmpfs/mount_tmpfs.c
> ===================================================================
> RCS file: /cvs/src/sbin/mount_tmpfs/mount_tmpfs.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 mount_tmpfs.c
> --- sbin/mount_tmpfs/mount_tmpfs.c    11 Jul 2018 07:03:03 -0000      1.7
> +++ sbin/mount_tmpfs/mount_tmpfs.c    4 Dec 2022 02:10:00 -0000
> @@ -132,7 +132,6 @@ mount_tmpfs_parseargs(int argc, char *ar
>                       uidset = 1;
>                       break;
>  
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/newfs/newfs.c
> ===================================================================
> RCS file: /cvs/src/sbin/newfs/newfs.c,v
> retrieving revision 1.116
> diff -u -p -r1.116 newfs.c
> --- sbin/newfs/newfs.c        19 Nov 2022 08:02:11 -0000      1.116
> +++ sbin/newfs/newfs.c        4 Dec 2022 02:10:00 -0000
> @@ -310,7 +310,6 @@ main(int argc, char *argv[])
>                       pop = optarg;
>                       break;
>  #endif
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/newfs_ext2fs/newfs_ext2fs.c
> ===================================================================
> RCS file: /cvs/src/sbin/newfs_ext2fs/newfs_ext2fs.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 newfs_ext2fs.c
> --- sbin/newfs_ext2fs/newfs_ext2fs.c  26 Jun 2021 15:42:58 -0000      1.28
> +++ sbin/newfs_ext2fs/newfs_ext2fs.c  4 Dec 2022 02:10:00 -0000
> @@ -212,7 +212,6 @@ main(int argc, char *argv[])
>                               errx(EXIT_FAILURE,
>                                   "Volume name cannot be zero length");
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/savecore/savecore.c
> ===================================================================
> RCS file: /cvs/src/sbin/savecore/savecore.c,v
> retrieving revision 1.64
> diff -u -p -r1.64 savecore.c
> --- sbin/savecore/savecore.c  25 Mar 2022 16:14:55 -0000      1.64
> +++ sbin/savecore/savecore.c  4 Dec 2022 02:10:00 -0000
> @@ -154,7 +154,6 @@ main(int argc, char *argv[])
>               case 'z':
>                       zcompress = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/scsi/scsi.c
> ===================================================================
> RCS file: /cvs/src/sbin/scsi/scsi.c,v
> retrieving revision 1.31
> diff -u -p -r1.31 scsi.c
> --- sbin/scsi/scsi.c  22 Jun 2021 14:51:29 -0000      1.31
> +++ sbin/scsi/scsi.c  4 Dec 2022 02:10:01 -0000
> @@ -133,7 +133,6 @@ procargs(int *argc_p, char ***argv_p)
>               case 'v':
>                       verbose = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: sbin/ttyflags/ttyflags.c
> ===================================================================
> RCS file: /cvs/src/sbin/ttyflags/ttyflags.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 ttyflags.c
> --- sbin/ttyflags/ttyflags.c  24 Oct 2021 21:24:22 -0000      1.16
> +++ sbin/ttyflags/ttyflags.c  4 Dec 2022 02:10:01 -0000
> @@ -78,7 +78,6 @@ main(int argc, char *argv[])
>               case 'v':
>                       vflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/biff/biff.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/biff/biff.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 biff.c
> --- usr.bin/biff/biff.c       12 Jul 2021 15:09:19 -0000      1.18
> +++ usr.bin/biff/biff.c       4 Dec 2022 02:10:01 -0000
> @@ -51,7 +51,6 @@ main(int argc, char *argv[])
>  
>       while ((ch = getopt(argc, argv, "")) != -1)
>               switch(ch) {
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/cal/cal.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/cal/cal.c,v
> retrieving revision 1.30
> diff -u -p -r1.30 cal.c
> --- usr.bin/cal/cal.c 9 Oct 2015 01:37:06 -0000       1.30
> +++ usr.bin/cal/cal.c 4 Dec 2022 02:10:01 -0000
> @@ -168,7 +168,6 @@ main(int argc, char *argv[])
>               case 'y':
>                       yflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/cap_mkdb/cap_mkdb.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/cap_mkdb/cap_mkdb.c,v
> retrieving revision 1.25
> diff -u -p -r1.25 cap_mkdb.c
> --- usr.bin/cap_mkdb/cap_mkdb.c       15 Sep 2020 07:41:38 -0000      1.25
> +++ usr.bin/cap_mkdb/cap_mkdb.c       4 Dec 2022 02:10:01 -0000
> @@ -87,7 +87,6 @@ main(int argc, char *argv[])
>               case 'v':
>                       verbose = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/chpass/chpass.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/chpass/chpass.c,v
> retrieving revision 1.48
> diff -u -p -r1.48 chpass.c
> --- usr.bin/chpass/chpass.c   24 Oct 2021 21:24:16 -0000      1.48
> +++ usr.bin/chpass/chpass.c   4 Dec 2022 02:10:01 -0000
> @@ -84,7 +84,6 @@ main(int argc, char *argv[])
>                       op = NEWSH;
>                       arg = optarg;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/col/col.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/col/col.c,v
> retrieving revision 1.19
> diff -u -p -r1.19 col.c
> --- usr.bin/col/col.c 9 Oct 2015 01:37:06 -0000       1.19
> +++ usr.bin/col/col.c 4 Dec 2022 02:10:01 -0000
> @@ -139,7 +139,6 @@ main(int argc, char *argv[])
>               case 'x':               /* do not compress spaces into tabs */
>                       compress_spaces = 0;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/colrm/colrm.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/colrm/colrm.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 colrm.c
> --- usr.bin/colrm/colrm.c     27 Oct 2016 12:53:54 -0000      1.13
> +++ usr.bin/colrm/colrm.c     4 Dec 2022 02:10:01 -0000
> @@ -62,7 +62,6 @@ main(int argc, char *argv[])
>  
>       while ((ch = getopt(argc, argv, "")) != -1)
>               switch(ch) {
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/comm/comm.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/comm/comm.c,v
> retrieving revision 1.10
> diff -u -p -r1.10 comm.c
> --- usr.bin/comm/comm.c       9 Oct 2015 01:37:07 -0000       1.10
> +++ usr.bin/comm/comm.c       4 Dec 2022 02:10:01 -0000
> @@ -80,7 +80,6 @@ main(int argc, char *argv[])
>               case 'f':
>                       compare = strcasecmp;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/ctags/ctags.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/ctags/ctags.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 ctags.c
> --- usr.bin/ctags/ctags.c     9 Oct 2015 01:37:07 -0000       1.18
> +++ usr.bin/ctags/ctags.c     4 Dec 2022 02:10:01 -0000
> @@ -112,7 +112,6 @@ main(int argc, char *argv[])
>               case 'x':
>                       xflag = 1;
>                       break;
> -             case '?':
>               default:
>                       goto usage;
>               }
> Index: usr.bin/cut/cut.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/cut/cut.c,v
> retrieving revision 1.26
> diff -u -p -r1.26 cut.c
> --- usr.bin/cut/cut.c 7 Feb 2019 19:11:23 -0000       1.26
> +++ usr.bin/cut/cut.c 4 Dec 2022 02:10:01 -0000
> @@ -104,7 +104,6 @@ main(int argc, char *argv[])
>               case 's':
>                       sflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/du/du.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/du/du.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 du.c
> --- usr.bin/du/du.c   24 Aug 2016 03:13:45 -0000      1.32
> +++ usr.bin/du/du.c   4 Dec 2022 02:10:01 -0000
> @@ -116,7 +116,6 @@ main(int argc, char *argv[])
>               case 'x':
>                       ftsoptions |= FTS_XDEV;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/expand/expand.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/expand/expand.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 expand.c
> --- usr.bin/expand/expand.c   9 Oct 2015 01:37:07 -0000       1.14
> +++ usr.bin/expand/expand.c   4 Dec 2022 02:10:01 -0000
> @@ -66,7 +66,6 @@ main(int argc, char *argv[])
>               case 't':
>                       getstops(optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       /* NOTREACHED */
> Index: usr.bin/find/main.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/find/main.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 main.c
> --- usr.bin/find/main.c       24 Oct 2021 21:24:16 -0000      1.32
> +++ usr.bin/find/main.c       4 Dec 2022 02:10:01 -0000
> @@ -99,7 +99,6 @@ main(int argc, char *argv[])
>                       ftsoptions &= ~FTS_NOSTAT;
>                       ftsoptions |= FTS_XDEV;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/logger/logger.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/logger/logger.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 logger.c
> --- usr.bin/logger/logger.c   17 Jun 2019 00:23:03 -0000      1.18
> +++ usr.bin/logger/logger.c   4 Dec 2022 02:10:01 -0000
> @@ -85,7 +85,6 @@ main(int argc, char *argv[])
>               case 't':               /* tag */
>                       tag = optarg;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/mesg/mesg.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/mesg/mesg.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 mesg.c
> --- usr.bin/mesg/mesg.c       12 Jul 2021 15:09:20 -0000      1.17
> +++ usr.bin/mesg/mesg.c       4 Dec 2022 02:10:01 -0000
> @@ -54,7 +54,6 @@ main(int argc, char *argv[])
>  
>       while ((ch = getopt(argc, argv, "")) != -1)
>               switch (ch) {
> -             case '?':
>               default:
>                       goto usage;
>               }
> Index: usr.bin/users/users.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/users/users.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 users.c
> --- usr.bin/users/users.c     12 Jul 2021 15:09:20 -0000      1.15
> +++ usr.bin/users/users.c     4 Dec 2022 02:10:01 -0000
> @@ -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);
> Index: usr.bin/finger/finger.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/finger/finger.c,v
> retrieving revision 1.27
> diff -u -p -r1.27 finger.c
> --- usr.bin/finger/finger.c   26 Apr 2018 12:42:51 -0000      1.27
> +++ usr.bin/finger/finger.c   4 Dec 2022 02:10:01 -0000
> @@ -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);
> Index: usr.bin/gencat/gencat.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/gencat/gencat.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 gencat.c
> --- usr.bin/gencat/gencat.c   25 Jul 2019 13:53:57 -0000      1.20
> +++ usr.bin/gencat/gencat.c   4 Dec 2022 02:10:02 -0000
> @@ -139,7 +139,6 @@ main(int argc, char *argv[])
>  
>       while ((c = getopt(argc, argv, "")) != -1) {
>               switch (c) {
> -             case '?':
>               default:
>                       usage();
>                       /* NOTREACHED */
> Index: usr.bin/getconf/getconf.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/getconf/getconf.c,v
> retrieving revision 1.22
> diff -u -p -r1.22 getconf.c
> --- usr.bin/getconf/getconf.c 20 Jul 2022 14:23:13 -0000      1.22
> +++ usr.bin/getconf/getconf.c 4 Dec 2022 02:10:02 -0000
> @@ -420,7 +420,6 @@ main(int argc, char *argv[])
>                       if (! compilation_spec_valid(optarg))
>                               errx(1, "%s: unknown specification", optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/hexdump/hexsyntax.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/hexdump/hexsyntax.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 hexsyntax.c
> --- usr.bin/hexdump/hexsyntax.c       15 Mar 2016 04:19:13 -0000      1.13
> +++ usr.bin/hexdump/hexsyntax.c       4 Dec 2022 02:10:02 -0000
> @@ -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();
>               }
>  
> Index: usr.bin/id/id.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/id/id.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 id.c
> --- usr.bin/id/id.c   30 May 2017 15:29:53 -0000      1.28
> +++ usr.bin/id/id.c   4 Dec 2022 02:10:02 -0000
> @@ -107,7 +107,6 @@ main(int argc, char *argv[])
>               case 'u':
>                       uflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/join/join.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/join/join.c,v
> retrieving revision 1.33
> diff -u -p -r1.33 join.c
> --- usr.bin/join/join.c       23 Jul 2020 20:13:01 -0000      1.33
> +++ usr.bin/join/join.c       4 Dec 2022 02:10:02 -0000
> @@ -187,7 +187,6 @@ main(int argc, char *argv[])
>                       if (*end)
>                               errx(1, "illegal file number -- %s", optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/lastcomm/lastcomm.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/lastcomm/lastcomm.c,v
> retrieving revision 1.30
> diff -u -p -r1.30 lastcomm.c
> --- usr.bin/lastcomm/lastcomm.c       13 Dec 2021 16:37:37 -0000      1.30
> +++ usr.bin/lastcomm/lastcomm.c       4 Dec 2022 02:10:02 -0000
> @@ -77,7 +77,6 @@ main(int argc, char *argv[])
>               case 'f':
>                       acctfile = optarg;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/look/look.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/look/look.c,v
> retrieving revision 1.26
> diff -u -p -r1.26 look.c
> --- usr.bin/look/look.c       10 Feb 2022 14:55:43 -0000      1.26
> +++ usr.bin/look/look.c       4 Dec 2022 02:10:02 -0000
> @@ -93,7 +93,6 @@ main(int argc, char *argv[])
>               case 't':
>                       termchar = *optarg;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/m4/main.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/m4/main.c,v
> retrieving revision 1.87
> diff -u -p -r1.87 main.c
> --- usr.bin/m4/main.c 15 Jun 2017 13:48:42 -0000      1.87
> +++ usr.bin/m4/main.c 4 Dec 2022 02:10:02 -0000
> @@ -228,7 +228,7 @@ main(int argc, char *argv[])
>               case 'o':
>                       trace_file(optarg);
>                          break;
> -             case '?':
> +             default:
>                       usage();
>               }
>  
> Index: usr.bin/make/main.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/make/main.c,v
> retrieving revision 1.127
> diff -u -p -r1.127 main.c
> --- usr.bin/make/main.c       13 Jan 2020 15:41:53 -0000      1.127
> +++ usr.bin/make/main.c       4 Dec 2022 02:10:02 -0000
> @@ -170,7 +170,6 @@ posixParseOptLetter(int c)
>               touchFlag = true;
>               break;
>       default:
> -     case '?':
>               usage();
>       }
>       record_option(c, NULL);
> Index: usr.bin/netstat/main.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/netstat/main.c,v
> retrieving revision 1.122
> diff -u -p -r1.122 main.c
> --- usr.bin/netstat/main.c    8 Sep 2022 13:18:47 -0000       1.122
> +++ usr.bin/netstat/main.c    4 Dec 2022 02:10:02 -0000
> @@ -284,7 +284,6 @@ main(int argc, char *argv[])
>                               errx(1, "interval is %s", errstr);
>                       iflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/nfsstat/nfsstat.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/nfsstat/nfsstat.c,v
> retrieving revision 1.36
> diff -u -p -r1.36 nfsstat.c
> --- usr.bin/nfsstat/nfsstat.c 27 Aug 2016 04:07:42 -0000      1.36
> +++ usr.bin/nfsstat/nfsstat.c 4 Dec 2022 02:10:02 -0000
> @@ -106,7 +106,6 @@ main(int argc, char *argv[])
>               case 'c':
>                       display = SHOW_CLIENT;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/nl/nl.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/nl/nl.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 nl.c
> --- usr.bin/nl/nl.c   21 Apr 2019 01:08:46 -0000      1.7
> +++ usr.bin/nl/nl.c   4 Dec 2022 02:10:02 -0000
> @@ -196,7 +196,6 @@ main(int argc, char *argv[])
>                               errx(EXIT_FAILURE, "width is %s: %s", errstr,
>                                   optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       /* NOTREACHED */
> Index: usr.bin/nm/nm.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/nm/nm.c,v
> retrieving revision 1.54
> diff -u -p -r1.54 nm.c
> --- usr.bin/nm/nm.c   3 Mar 2019 16:07:39 -0000       1.54
> +++ usr.bin/nm/nm.c   4 Dec 2022 02:10:02 -0000
> @@ -206,7 +206,6 @@ main(int argc, char *argv[])
>                                       usage();
>                       }
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/paste/paste.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/paste/paste.c,v
> retrieving revision 1.26
> diff -u -p -r1.26 paste.c
> --- usr.bin/paste/paste.c     4 Aug 2018 19:19:37 -0000       1.26
> +++ usr.bin/paste/paste.c     4 Dec 2022 02:10:02 -0000
> @@ -69,7 +69,6 @@ main(int argc, char *argv[])
>               case 's':
>                       seq = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/rdist/rdist.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/rdist/rdist.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 rdist.c
> --- usr.bin/rdist/rdist.c     22 Jun 2021 20:19:28 -0000      1.32
> +++ usr.bin/rdist/rdist.c     4 Dec 2022 02:10:02 -0000
> @@ -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();
>               }
> Index: usr.bin/rdistd/rdistd.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/rdistd/rdistd.c,v
> retrieving revision 1.10
> diff -u -p -r1.10 rdistd.c
> --- usr.bin/rdistd/rdistd.c   8 Feb 2015 23:40:34 -0000       1.10
> +++ usr.bin/rdistd/rdistd.c   4 Dec 2022 02:10:02 -0000
> @@ -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();
> Index: usr.bin/sed/main.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/sed/main.c,v
> retrieving revision 1.42
> diff -u -p -r1.42 main.c
> --- usr.bin/sed/main.c        31 Jan 2021 14:23:05 -0000      1.42
> +++ usr.bin/sed/main.c        4 Dec 2022 02:10:02 -0000
> @@ -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");
> Index: usr.bin/ssh/ssh-keygen.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/ssh/ssh-keygen.c,v
> retrieving revision 1.460
> diff -u -p -r1.460 ssh-keygen.c
> --- usr.bin/ssh/ssh-keygen.c  7 Nov 2022 04:04:40 -0000       1.460
> +++ usr.bin/ssh/ssh-keygen.c  4 Dec 2022 02:10:03 -0000
> @@ -3520,7 +3520,6 @@ main(int argc, char **argv)
>                       else
>                               fatal("Unsupported moduli option %s", optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/ssh/ssh-keyscan.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/ssh/ssh-keyscan.c,v
> retrieving revision 1.147
> diff -u -p -r1.147 ssh-keyscan.c
> --- usr.bin/ssh/ssh-keyscan.c 28 Oct 2022 02:29:34 -0000      1.147
> +++ usr.bin/ssh/ssh-keyscan.c 4 Dec 2022 02:10:03 -0000
> @@ -785,7 +785,6 @@ main(int argc, char **argv)
>               case '6':
>                       IPv4or6 = AF_INET6;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/ssh/sshd.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/ssh/sshd.c,v
> retrieving revision 1.592
> diff -u -p -r1.592 sshd.c
> --- usr.bin/ssh/sshd.c        28 Oct 2022 00:44:17 -0000      1.592
> +++ usr.bin/ssh/sshd.c        4 Dec 2022 02:10:03 -0000
> @@ -1580,7 +1580,6 @@ main(int ac, char **av)
>                               exit(1);
>                       free(line);
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       break;
> Index: usr.bin/tail/tail.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/tail/tail.c,v
> retrieving revision 1.23
> diff -u -p -r1.23 tail.c
> --- usr.bin/tail/tail.c       23 Dec 2021 23:23:42 -0000      1.23
> +++ usr.bin/tail/tail.c       4 Dec 2022 02:10:03 -0000
> @@ -114,7 +114,6 @@ main(int argc, char *argv[])
>               case 'r':
>                       rflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/telnet/main.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/telnet/main.c,v
> retrieving revision 1.36
> diff -u -p -r1.36 main.c
> --- usr.bin/telnet/main.c     6 Dec 2015 12:00:16 -0000       1.36
> +++ usr.bin/telnet/main.c     4 Dec 2022 02:10:03 -0000
> @@ -155,7 +155,6 @@ main(int argc, char *argv[])
>                                   prompt, errstr, optarg);
>                       }
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/tput/tput.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/tput/tput.c,v
> retrieving revision 1.24
> diff -u -p -r1.24 tput.c
> --- usr.bin/tput/tput.c       25 Jan 2019 00:19:27 -0000      1.24
> +++ usr.bin/tput/tput.c       4 Dec 2022 02:10:03 -0000
> @@ -90,7 +90,6 @@ main(int argc, char *argv[])
>               case 'S':
>                       Sflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/tr/tr.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/tr/tr.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 tr.c
> --- usr.bin/tr/tr.c   11 Feb 2022 16:09:21 -0000      1.21
> +++ usr.bin/tr/tr.c   4 Dec 2022 02:10:03 -0000
> @@ -104,7 +104,6 @@ main(int argc, char *argv[])
>               case 's':
>                       sflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/tset/tset.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/tset/tset.c,v
> retrieving revision 1.43
> diff -u -p -r1.43 tset.c
> --- usr.bin/tset/tset.c       22 Jun 2021 18:33:48 -0000      1.43
> +++ usr.bin/tset/tset.c       4 Dec 2022 02:10:03 -0000
> @@ -1176,7 +1176,6 @@ main(int argc, char **argv)
>       case 'w':               /* set window-size */
>           opt_w = TRUE;
>           break;
> -     case '?':
>       default:
>           usage();
>       }
> Index: usr.bin/tty/tty.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/tty/tty.c,v
> retrieving revision 1.12
> diff -u -p -r1.12 tty.c
> --- usr.bin/tty/tty.c 12 Jul 2021 15:09:20 -0000      1.12
> +++ usr.bin/tty/tty.c 4 Dec 2022 02:10:03 -0000
> @@ -50,7 +50,6 @@ main(int argc, char *argv[])
>               case 's':
>                       sflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       /* NOTREACHED */
> Index: usr.bin/unvis/unvis.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/unvis/unvis.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 unvis.c
> --- usr.bin/unvis/unvis.c     9 Oct 2015 01:37:09 -0000       1.14
> +++ usr.bin/unvis/unvis.c     4 Dec 2022 02:10:03 -0000
> @@ -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);
> Index: usr.bin/usbhidctl/usbhid.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/usbhidctl/usbhid.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 usbhid.c
> --- usr.bin/usbhidctl/usbhid.c        15 Dec 2021 11:21:35 -0000      1.18
> +++ usr.bin/usbhidctl/usbhid.c        4 Dec 2022 02:10:03 -0000
> @@ -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 */
> Index: usr.bin/usbhidaction/usbhidaction.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/usbhidaction/usbhidaction.c,v
> retrieving revision 1.25
> diff -u -p -r1.25 usbhidaction.c
> --- usr.bin/usbhidaction/usbhidaction.c       2 Aug 2022 09:07:34 -0000       
> 1.25
> +++ usr.bin/usbhidaction/usbhidaction.c       4 Dec 2022 02:10:03 -0000
> @@ -111,7 +111,6 @@ main(int argc, char **argv)
>                       demon = 0;
>                       verbose++;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/vis/vis.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/vis/vis.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 vis.c
> --- usr.bin/vis/vis.c 3 Aug 2020 01:08:37 -0000       1.21
> +++ usr.bin/vis/vis.c 4 Dec 2022 02:10:03 -0000
> @@ -102,7 +102,6 @@ main(int argc, char *argv[])
>                       debug = 1;
>                       break;
>  #endif
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/vmstat/vmstat.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/vmstat/vmstat.c,v
> retrieving revision 1.154
> diff -u -p -r1.154 vmstat.c
> --- usr.bin/vmstat/vmstat.c   26 Jul 2022 14:49:13 -0000      1.154
> +++ usr.bin/vmstat/vmstat.c   4 Dec 2022 02:10:03 -0000
> @@ -172,7 +172,6 @@ main(int argc, char *argv[])
>               case 'z':
>                       zflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.bin/w/w.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/w/w.c,v
> retrieving revision 1.67
> diff -u -p -r1.67 w.c
> --- usr.bin/w/w.c     22 Feb 2022 17:35:01 -0000      1.67
> +++ usr.bin/w/w.c     4 Dec 2022 02:10:03 -0000
> @@ -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);
>               }
> Index: usr.bin/wc/wc.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/wc/wc.c,v
> retrieving revision 1.30
> diff -u -p -r1.30 wc.c
> --- usr.bin/wc/wc.c   2 Sep 2022 15:21:40 -0000       1.30
> +++ usr.bin/wc/wc.c   4 Dec 2022 02:10:03 -0000
> @@ -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",
> Index: usr.bin/xargs/xargs.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/xargs/xargs.c,v
> retrieving revision 1.35
> diff -u -p -r1.35 xargs.c
> --- usr.bin/xargs/xargs.c     19 Jul 2020 13:19:25 -0000      1.35
> +++ usr.bin/xargs/xargs.c     4 Dec 2022 02:10:03 -0000
> @@ -169,10 +169,9 @@ main(int argc, char *argv[])
>               case '0':
>                       zflag = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
> -     }
> +             }
>       argc -= optind;
>       argv += optind;
>  
> Index: usr.bin/xinstall/xinstall.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/xinstall/xinstall.c,v
> retrieving revision 1.76
> diff -u -p -r1.76 xinstall.c
> --- usr.bin/xinstall/xinstall.c       28 Nov 2021 19:28:42 -0000      1.76
> +++ usr.bin/xinstall/xinstall.c       4 Dec 2022 02:10:03 -0000
> @@ -140,7 +140,6 @@ main(int argc, char *argv[])
>               case 'd':
>                       dodir = 1;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/ac/ac.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/ac/ac.c,v
> retrieving revision 1.27
> diff -u -p -r1.27 ac.c
> --- usr.sbin/ac/ac.c  23 Aug 2018 06:27:54 -0000      1.27
> +++ usr.sbin/ac/ac.c  4 Dec 2022 02:10:03 -0000
> @@ -223,7 +223,6 @@ main(int argc, char *argv[])
>               case 'w':
>                       fp = file(optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       break;
> Index: usr.sbin/apmd/apmd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/apmd/apmd.c,v
> retrieving revision 1.109
> diff -u -p -r1.109 apmd.c
> --- usr.sbin/apmd/apmd.c      18 Feb 2022 22:54:13 -0000      1.109
> +++ usr.sbin/apmd/apmd.c      4 Dec 2022 02:10:04 -0000
> @@ -480,7 +480,6 @@ main(int argc, char *argv[])
>                               errx(1, "battery percentage is %s: %s", errstr,
>                                   optarg);
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/dev_mkdb/dev_mkdb.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/dev_mkdb/dev_mkdb.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 dev_mkdb.c
> --- usr.sbin/dev_mkdb/dev_mkdb.c      12 Jul 2021 15:09:20 -0000      1.18
> +++ usr.sbin/dev_mkdb/dev_mkdb.c      4 Dec 2022 02:10:04 -0000
> @@ -75,7 +75,6 @@ main(int argc, char *argv[])
>  
>       while ((ch = getopt(argc, argv, "")) != -1)
>               switch(ch) {
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/fdformat/fdformat.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/fdformat/fdformat.c,v
> retrieving revision 1.24
> diff -u -p -r1.24 fdformat.c
> --- usr.sbin/fdformat/fdformat.c      28 Jun 2019 13:32:47 -0000      1.24
> +++ usr.sbin/fdformat/fdformat.c      4 Dec 2022 02:10:04 -0000
> @@ -236,7 +236,7 @@ main(int argc, char *argv[])
>                       verify_only = 1;
>                       break;
>  
> -             case '?': default:
> +             default:
>                       usage();
>               }
>  
> Index: usr.sbin/hotplugd/hotplugd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/hotplugd/hotplugd.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 hotplugd.c
> --- usr.sbin/hotplugd/hotplugd.c      12 Jul 2021 15:09:21 -0000      1.17
> +++ usr.sbin/hotplugd/hotplugd.c      4 Dec 2022 02:10:04 -0000
> @@ -67,7 +67,6 @@ main(int argc, char *argv[])
>               case 'd':
>                       device = optarg;
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       /* NOTREACHED */
> Index: usr.sbin/inetd/inetd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/inetd/inetd.c,v
> retrieving revision 1.162
> diff -u -p -r1.162 inetd.c
> --- usr.sbin/inetd/inetd.c    30 Dec 2020 18:41:06 -0000      1.162
> +++ usr.sbin/inetd/inetd.c    4 Dec 2022 02:10:04 -0000
> @@ -314,7 +314,6 @@ main(int argc, char *argv[])
>                           optarg);
>                       break;
>               }
> -             case '?':
>               default:
>                       fprintf(stderr,
>                           "usage: inetd [-d] [-R rate] 
> [configuration_file]\n");
> Index: usr.sbin/iostat/iostat.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/iostat/iostat.c,v
> retrieving revision 1.44
> diff -u -p -r1.44 iostat.c
> --- usr.sbin/iostat/iostat.c  12 Jul 2021 15:09:21 -0000      1.44
> +++ usr.sbin/iostat/iostat.c  4 Dec 2022 02:10:04 -0000
> @@ -150,7 +150,6 @@ main(int argc, char *argv[])
>                       if (errstr)
>                               errx(1, "wait is %s", errstr);
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/lpr/lpq/lpq.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/lpr/lpq/lpq.c,v
> retrieving revision 1.23
> diff -u -p -r1.23 lpq.c
> --- usr.sbin/lpr/lpq/lpq.c    29 Feb 2016 17:26:02 -0000      1.23
> +++ usr.sbin/lpr/lpq/lpq.c    4 Dec 2022 02:10:04 -0000
> @@ -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();
>               }
> Index: usr.sbin/makefs/makefs.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/makefs/makefs.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 makefs.c
> --- usr.sbin/makefs/makefs.c  12 Jul 2021 15:09:21 -0000      1.21
> +++ usr.sbin/makefs/makefs.c  4 Dec 2022 02:10:04 -0000
> @@ -187,7 +187,6 @@ main(int argc, char *argv[])
>                       stampts = get_tstamp(optarg);
>                       break;
>  
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/mtree/mtree.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/mtree/mtree.c,v
> retrieving revision 1.27
> diff -u -p -r1.27 mtree.c
> --- usr.sbin/mtree/mtree.c    15 Nov 2021 15:14:24 -0000      1.27
> +++ usr.sbin/mtree/mtree.c    4 Dec 2022 02:10:04 -0000
> @@ -124,7 +124,6 @@ main(int argc, char *argv[])
>               case 'x':
>                       ftsoptions |= FTS_XDEV;
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/netgroup_mkdb/netgroup_mkdb.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/netgroup_mkdb/netgroup_mkdb.c,v
> retrieving revision 1.22
> diff -u -p -r1.22 netgroup_mkdb.c
> --- usr.sbin/netgroup_mkdb/netgroup_mkdb.c    28 Jun 2019 14:20:40 -0000      
> 1.22
> +++ usr.sbin/netgroup_mkdb/netgroup_mkdb.c    4 Dec 2022 02:10:04 -0000
> @@ -110,7 +110,6 @@ main(int argc, char *argv[])
>                       dbname = optarg;
>                       break;
>  
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/pwd_mkdb/pwd_mkdb.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v
> retrieving revision 1.59
> diff -u -p -r1.59 pwd_mkdb.c
> --- usr.sbin/pwd_mkdb/pwd_mkdb.c      28 Nov 2021 19:28:42 -0000      1.59
> +++ usr.sbin/pwd_mkdb/pwd_mkdb.c      4 Dec 2022 02:10:04 -0000
> @@ -135,7 +135,6 @@ main(int argc, char **argv)
>                       break;
>               case 'v':                       /* backward compatible */
>                       break;
> -             case '?':
>               default:
>                       usage();
>               }
> Index: usr.sbin/rpc.lockd/lockd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpc.lockd/lockd.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 lockd.c
> --- usr.sbin/rpc.lockd/lockd.c        18 Apr 2015 18:28:38 -0000      1.14
> +++ usr.sbin/rpc.lockd/lockd.c        4 Dec 2022 02:10:04 -0000
> @@ -91,7 +91,6 @@ main(int argc, char *argv[])
>                       }
>                       break;
>               default:
> -             case '?':
>                       usage();
>                       /* NOTREACHED */
>               }
> Index: usr.sbin/rpc.statd/statd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpc.statd/statd.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 statd.c
> --- usr.sbin/rpc.statd/statd.c        21 Jan 2017 08:33:51 -0000      1.4
> +++ usr.sbin/rpc.statd/statd.c        4 Dec 2022 02:10:04 -0000
> @@ -97,7 +97,6 @@ main(int argc, char **argv)
>                       debug = 1;
>                       break;
>               default:
> -             case '?':
>                       fprintf(stderr, "usage: %s [-d]\n", __progname);
>                       exit(1);
>                       /* NOTREACHED */
> Index: usr.sbin/sa/main.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/sa/main.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 main.c
> --- usr.sbin/sa/main.c        22 Feb 2022 17:22:29 -0000      1.18
> +++ usr.sbin/sa/main.c        4 Dec 2022 02:10:04 -0000
> @@ -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]"
> Index: usr.sbin/wsfontload/wsfontload.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/wsfontload/wsfontload.c,v
> retrieving revision 1.25
> diff -u -p -r1.25 wsfontload.c
> --- usr.sbin/wsfontload/wsfontload.c  25 Oct 2021 19:54:29 -0000      1.25
> +++ usr.sbin/wsfontload/wsfontload.c  4 Dec 2022 02:10:04 -0000
> @@ -121,7 +121,6 @@ main(int argc, char *argv[])
>               case 'B':
>                       f.byteorder = WSDISPLAY_FONTORDER_R2L;
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       break;
> Index: usr.sbin/wsconscfg/wsconscfg.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/wsconscfg/wsconscfg.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 wsconscfg.c
> --- usr.sbin/wsconscfg/wsconscfg.c    24 Oct 2021 21:24:19 -0000      1.17
> +++ usr.sbin/wsconscfg/wsconscfg.c    4 Dec 2022 02:10:04 -0000
> @@ -98,7 +98,6 @@ main(int argc, char *argv[])
>               case 'F':
>                       dsd.flags |= WSDISPLAY_DELSCR_FORCE;
>                       break;
> -             case '?':
>               default:
>                       usage();
>                       break;
> 


Reply via email to