Hello tech@

delete "case '?': /* FALLTHROUGH */" where it is already handled 
by "default: usage();".

Rarely also adjust getopt(3)'s optstring.



Index: bin/pax/options.c
===================================================================
RCS file: /cvs/src/bin/pax/options.c,v
retrieving revision 1.91
diff -u -p -r1.91 options.c
--- bin/pax/options.c   18 May 2015 20:26:16 -0000      1.91
+++ bin/pax/options.c   9 Jun 2015 17:27:56 -0000
@@ -1307,7 +1307,6 @@ cpio_options(int argc, char **argv)
                                 */
                                frmt = &(fsub[F_OCPIO]);
                                break;
-                       case '?':
                        default:
                                cpio_usage();
                                break;
Index: games/arithmetic/arithmetic.c
===================================================================
RCS file: /cvs/src/games/arithmetic/arithmetic.c,v
retrieving revision 1.18
diff -u -p -r1.18 arithmetic.c
--- games/arithmetic/arithmetic.c       29 Aug 2013 20:22:09 -0000      1.18
+++ games/arithmetic/arithmetic.c       9 Jun 2015 17:28:09 -0000
@@ -116,7 +116,6 @@ main(int argc, char *argv[])
                        if ((rangemax = atoi(optarg)) <= 0)
                                errx(1, "invalid range.");
                        break;
-               case '?':
                case 'h':
                default:
                        usage();
Index: games/banner/banner.c
===================================================================
RCS file: /cvs/src/games/banner/banner.c,v
retrieving revision 1.17
diff -u -p -r1.17 banner.c
--- games/banner/banner.c       10 Feb 2015 13:50:58 -0000      1.17
+++ games/banner/banner.c       9 Jun 2015 17:28:09 -0000
@@ -1030,7 +1030,7 @@ main(int argc, char *argv[])
                        if (width <= 0 || width > DWIDTH)
                                errx(1, "illegal argument for -w option");
                        break;
-               case '?': case 'h':
+               case 'h':
                default:
                        (void)fprintf(stderr,
                            "usage: banner [-w width] message ...\n");
Index: games/boggle/boggle/bog.c
===================================================================
RCS file: /cvs/src/games/boggle/boggle/bog.c,v
retrieving revision 1.24
diff -u -p -r1.24 bog.c
--- games/boggle/boggle/bog.c   4 Dec 2014 06:12:33 -0000       1.24
+++ games/boggle/boggle/bog.c   9 Jun 2015 17:28:09 -0000
@@ -117,7 +117,6 @@ main(int argc, char *argv[])
                        if ((minlength = atoi(optarg)) < 3)
                                errx(1, "min word length must be > 2");
                        break;
-               case '?':
                default:
                        usage();
                }
Index: games/cribbage/crib.c
===================================================================
RCS file: /cvs/src/games/cribbage/crib.c,v
retrieving revision 1.18
diff -u -p -r1.18 crib.c
--- games/cribbage/crib.c       12 Mar 2015 02:19:10 -0000      1.18
+++ games/cribbage/crib.c       9 Jun 2015 17:28:09 -0000
@@ -63,7 +63,6 @@ main(int argc, char *argv[])
                case 'r':
                        rflag = TRUE;
                        break;
-               case '?':
                default:
                        (void) fprintf(stderr, "usage: cribbage [-emqr]\n");
                        exit(1);
Index: games/factor/factor.c
===================================================================
RCS file: /cvs/src/games/factor/factor.c,v
retrieving revision 1.19
diff -u -p -r1.19 factor.c
--- games/factor/factor.c       27 Oct 2009 23:59:24 -0000      1.19
+++ games/factor/factor.c       9 Jun 2015 17:28:09 -0000
@@ -89,7 +89,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch (ch) {
-               case '?':
                default:
                        usage();
                }
Index: games/fish/fish.c
===================================================================
RCS file: /cvs/src/games/fish/fish.c,v
retrieving revision 1.17
diff -u -p -r1.17 fish.c
--- games/fish/fish.c   18 Feb 2015 23:20:45 -0000      1.17
+++ games/fish/fish.c   9 Jun 2015 17:28:09 -0000
@@ -92,7 +92,6 @@ main(int argc, char *argv[])
                case 'p':
                        promode = 1;
                        break;
-               case '?':
                case 'h':
                default:
                        usage();
Index: games/fortune/fortune/fortune.c
===================================================================
RCS file: /cvs/src/games/fortune/fortune/fortune.c,v
retrieving revision 1.42
diff -u -p -r1.42 fortune.c
--- games/fortune/fortune/fortune.c     6 Feb 2015 10:50:48 -0000       1.42
+++ games/fortune/fortune/fortune.c     9 Jun 2015 17:28:09 -0000
@@ -303,7 +303,6 @@ getargs(int argc, char *argv[])
                case 'i':                       /* case-insensitive match */
                        ignore_case = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: games/fortune/strfile/strfile.c
===================================================================
RCS file: /cvs/src/games/fortune/strfile/strfile.c,v
retrieving revision 1.21
diff -u -p -r1.21 strfile.c
--- games/fortune/strfile/strfile.c     16 Nov 2014 04:49:48 -0000      1.21
+++ games/fortune/strfile/strfile.c     9 Jun 2015 17:28:09 -0000
@@ -274,7 +274,6 @@ getargs(int argc, char *argv[])
                case 'x':                       /* set the rotated bit */
                        Xflag++;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: games/grdc/grdc.c
===================================================================
RCS file: /cvs/src/games/grdc/grdc.c,v
retrieving revision 1.19
diff -u -p -r1.19 grdc.c
--- games/grdc/grdc.c   19 Nov 2014 03:27:45 -0000      1.19
+++ games/grdc/grdc.c   9 Jun 2015 17:28:09 -0000
@@ -77,7 +77,6 @@ main(int argc, char *argv[])
                        scrol = 1;
                        break;
                case 'h':
-               case '?':
                default:
                        usage();
                }
Index: games/hangman/main.c
===================================================================
RCS file: /cvs/src/games/hangman/main.c,v
retrieving revision 1.12
diff -u -p -r1.12 main.c
--- games/hangman/main.c        7 Feb 2015 01:37:30 -0000       1.12
+++ games/hangman/main.c        9 Jun 2015 17:28:09 -0000
@@ -56,7 +56,6 @@ main(int argc, char *argv[])
                        Dict_name = _PATH_KSYMS;
                        break;
                case 'h':
-               case '?':
                default:
                        usage();
                }
Index: games/morse/morse.c
===================================================================
RCS file: /cvs/src/games/morse/morse.c,v
retrieving revision 1.15
diff -u -p -r1.15 morse.c
--- games/morse/morse.c 27 Nov 2013 13:32:02 -0000      1.15
+++ games/morse/morse.c 9 Jun 2015 17:28:09 -0000
@@ -120,7 +120,7 @@ main(int argc, char *argv[])
                case 's':
                        sflag = 1;
                        break;
-               case '?': case 'h':
+               case 'h':
                default:
                        fprintf(stderr, "usage: morse [-d | -s] [string 
...]\n");
                        exit(1);
Index: games/number/number.c
===================================================================
RCS file: /cvs/src/games/number/number.c,v
retrieving revision 1.14
diff -u -p -r1.14 number.c
--- games/number/number.c       27 Oct 2009 23:59:26 -0000      1.14
+++ games/number/number.c       9 Jun 2015 17:28:09 -0000
@@ -85,7 +85,6 @@ main(int argc, char *argv[])
                case 'l':
                        lflag = 1;
                        break;
-               case '?':
                case 'h':
                default:
                        usage();
Index: games/phantasia/setup.c
===================================================================
RCS file: /cvs/src/games/phantasia/setup.c,v
retrieving revision 1.13
diff -u -p -r1.13 setup.c
--- games/phantasia/setup.c     16 Nov 2014 04:49:48 -0000      1.13
+++ games/phantasia/setup.c     9 Jun 2015 17:28:09 -0000
@@ -75,7 +75,6 @@ main(argc, argv)
                case 'm':
                        monsterfile = optarg;
                        break;
-               case '?':
                default:
                        break;
                }
Index: games/pig/pig.c
===================================================================
RCS file: /cvs/src/games/pig/pig.c,v
retrieving revision 1.11
diff -u -p -r1.11 pig.c
--- games/pig/pig.c     27 Oct 2009 23:59:26 -0000      1.11
+++ games/pig/pig.c     9 Jun 2015 17:28:09 -0000
@@ -51,7 +51,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch(ch) {
-               case '?':
                default:
                        usage();
                }
Index: games/ppt/ppt.c
===================================================================
RCS file: /cvs/src/games/ppt/ppt.c,v
retrieving revision 1.12
diff -u -p -r1.12 ppt.c
--- games/ppt/ppt.c     7 Nov 2014 22:17:49 -0000       1.12
+++ games/ppt/ppt.c     9 Jun 2015 17:28:09 -0000
@@ -69,7 +69,7 @@ main(int argc, char **argv)
                case 'b':
                        bflag = 1;
                        break;
-               case '?': case 'h':
+               case 'h':
                default:
                        usage();
                }
Index: games/primes/primes.c
===================================================================
RCS file: /cvs/src/games/primes/primes.c,v
retrieving revision 1.15
diff -u -p -r1.15 primes.c
--- games/primes/primes.c       27 Oct 2009 23:59:26 -0000      1.15
+++ games/primes/primes.c       9 Jun 2015 17:28:09 -0000
@@ -105,7 +105,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch (ch) {
-               case '?':
                default:
                        usage();
                }
Index: games/quiz/quiz.c
===================================================================
RCS file: /cvs/src/games/quiz/quiz.c,v
retrieving revision 1.21
diff -u -p -r1.21 quiz.c
--- games/quiz/quiz.c   29 Aug 2013 20:22:18 -0000      1.21
+++ games/quiz/quiz.c   9 Jun 2015 17:28:09 -0000
@@ -75,7 +75,6 @@ main(int argc, char *argv[])
                case 't':
                        tflag = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: games/robots/main.c
===================================================================
RCS file: /cvs/src/games/robots/main.c,v
retrieving revision 1.19
diff -u -p -r1.19 main.c
--- games/robots/main.c 3 Nov 2014 22:14:54 -0000       1.19
+++ games/robots/main.c 9 Jun 2015 17:28:09 -0000
@@ -81,7 +81,6 @@ main(int ac, char *av[])
                case 't':
                        Teleport = TRUE;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: games/snake/snake.c
===================================================================
RCS file: /cvs/src/games/snake/snake.c,v
retrieving revision 1.16
diff -u -p -r1.16 snake.c
--- games/snake/snake.c 16 Nov 2014 04:49:49 -0000      1.16
+++ games/snake/snake.c 9 Jun 2015 17:28:09 -0000
@@ -161,7 +161,6 @@ main(int argc, char *argv[])
                case 't': /* slow terminal */
                        fast = 0;
                        break;
-               case '?':
                case 'h':
                default:
                        fputs("usage: snake [-st] [-l length] [-w width]\n",
Index: games/worms/worms.c
===================================================================
RCS file: /cvs/src/games/worms/worms.c,v
retrieving revision 1.22
diff -u -p -r1.22 worms.c
--- games/worms/worms.c 18 Feb 2015 23:16:08 -0000      1.22
+++ games/worms/worms.c 9 Jun 2015 17:28:09 -0000
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
                case 't':
                        trail = '.';
                        break;
-               case '?': case 'h':
+               case 'h':
                default:
                        (void)fprintf(stderr,
                            "usage: worms [-ft] [-d delay] [-l length] [-n 
number]\n");
Index: games/wump/wump.c
===================================================================
RCS file: /cvs/src/games/wump/wump.c,v
retrieving revision 1.26
diff -u -p -r1.26 wump.c
--- games/wump/wump.c   29 Aug 2013 20:22:22 -0000      1.26
+++ games/wump/wump.c   9 Jun 2015 17:28:09 -0000
@@ -176,7 +176,6 @@ main(int argc, char *argv[])
                                errx(1,
        "wumpii like extra doors in their caves!");
                        break;
-               case '?':
                default:
                        usage();
        }
Index: regress/lib/libc/db/dbtest.c
===================================================================
RCS file: /cvs/src/regress/lib/libc/db/dbtest.c,v
retrieving revision 1.13
diff -u -p -r1.13 dbtest.c
--- regress/lib/libc/db/dbtest.c        6 Feb 2015 23:21:58 -0000       1.13
+++ regress/lib/libc/db/dbtest.c        9 Jun 2015 17:28:19 -0000
@@ -108,7 +108,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.7
diff -u -p -r1.7 main.c
--- regress/lib/libc/regex/main.c       12 Sep 2007 19:32:35 -0000      1.7
+++ regress/lib/libc/regex/main.c       9 Jun 2015 17:28:19 -0000
@@ -63,7 +63,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.10
diff -u -p -r1.10 fmt_test.c
--- regress/lib/libutil/fmt_scaled/fmt_test.c   12 Nov 2012 14:10:48 -0000      
1.10
+++ regress/lib/libutil/fmt_scaled/fmt_test.c   9 Jun 2015 17:28:19 -0000
@@ -45,7 +45,6 @@ main(int argc, char **argv)
                                        break;
                        case 'h':
                                        usage(0);
-                       case '?':
                        default:
                                        usage(1);
                        }
Index: regress/sys/dev/audio/autest.c
===================================================================
RCS file: /cvs/src/regress/sys/dev/audio/autest.c,v
retrieving revision 1.12
diff -u -p -r1.12 autest.c
--- regress/sys/dev/audio/autest.c      25 Apr 2007 15:27:54 -0000      1.12
+++ regress/sys/dev/audio/autest.c      9 Jun 2015 17:28:19 -0000
@@ -140,7 +140,6 @@ main(int argc, char **argv)
                                return (1);
                        }
                        break;
-               case '?':
                default:
                        fprintf(stderr, "%s [-f device]\n", argv[0]);
                        return (1);
Index: sbin/disklabel/disklabel.c
===================================================================
RCS file: /cvs/src/sbin/disklabel/disklabel.c,v
retrieving revision 1.202
diff -u -p -r1.202 disklabel.c
--- sbin/disklabel/disklabel.c  3 Jun 2015 02:24:36 -0000       1.202
+++ sbin/disklabel/disklabel.c  9 Jun 2015 17:27:57 -0000
@@ -194,7 +194,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.25
diff -u -p -r1.25 dmesg.c
--- sbin/dmesg/dmesg.c  16 Jan 2015 06:39:57 -0000      1.25
+++ sbin/dmesg/dmesg.c  9 Jun 2015 17:27:57 -0000
@@ -81,7 +81,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.32
diff -u -p -r1.32 dumpfs.c
--- sbin/dumpfs/dumpfs.c        20 Jan 2015 18:22:21 -0000      1.32
+++ sbin/dumpfs/dumpfs.c        9 Jun 2015 17:27:57 -0000
@@ -89,7 +89,6 @@ main(int argc, char *argv[])
                case 'm':
                        domarshal = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: sbin/fsck/fsck.c
===================================================================
RCS file: /cvs/src/sbin/fsck/fsck.c,v
retrieving revision 1.37
diff -u -p -r1.37 fsck.c
--- sbin/fsck/fsck.c    29 May 2015 15:57:36 -0000      1.37
+++ sbin/fsck/fsck.c    9 Jun 2015 17:27:57 -0000
@@ -163,7 +163,6 @@ main(int argc, char *argv[])
                        filter = NET_FILTER;
                        break;
 
-               case '?':
                default:
                        usage();
                        /* NOTREACHED */
Index: sbin/growfs/growfs.c
===================================================================
RCS file: /cvs/src/sbin/growfs/growfs.c,v
retrieving revision 1.39
diff -u -p -r1.39 growfs.c
--- sbin/growfs/growfs.c        18 Apr 2015 18:28:37 -0000      1.39
+++ sbin/growfs/growfs.c        9 Jun 2015 17:27:57 -0000
@@ -1937,8 +1937,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.102
diff -u -p -r1.102 isakmpd.c
--- sbin/isakmpd/isakmpd.c      7 Feb 2015 02:09:13 -0000       1.102
+++ sbin/isakmpd/isakmpd.c      9 Jun 2015 17:27:57 -0000
@@ -210,7 +210,6 @@ parse_args(int argc, char *argv[])
                        verbose_logging = 1;
                        break;
 
-               case '?':
                default:
                        usage();
                }
Index: sbin/mknod/mknod.c
===================================================================
RCS file: /cvs/src/sbin/mknod/mknod.c,v
retrieving revision 1.18
diff -u -p -r1.18 mknod.c
--- sbin/mknod/mknod.c  27 Mar 2010 09:10:02 -0000      1.18
+++ sbin/mknod/mknod.c  9 Jun 2015 17:27:57 -0000
@@ -76,7 +76,6 @@ main(int argc, char *argv[])
                        mode = getmode(set, DEFFILEMODE);
                        free(set);
                        break;
-               case '?':
                default:
                        usage(ismkfifo);
                }
Index: sbin/mount/mount.c
===================================================================
RCS file: /cvs/src/sbin/mount/mount.c,v
retrieving revision 1.60
diff -u -p -r1.60 mount.c
--- sbin/mount/mount.c  16 Jan 2015 06:39:59 -0000      1.60
+++ sbin/mount/mount.c  9 Jun 2015 17:27:57 -0000
@@ -157,7 +157,6 @@ main(int argc, char * const argv[])
                        if (!hasopt(options, "rw"))
                                options = catopt(options, "rw");
                        break;
-               case '?':
                default:
                        usage();
                        /* NOTREACHED */
Index: sbin/mount_cd9660/mount_cd9660.c
===================================================================
RCS file: /cvs/src/sbin/mount_cd9660/mount_cd9660.c,v
retrieving revision 1.21
diff -u -p -r1.21 mount_cd9660.c
--- sbin/mount_cd9660/mount_cd9660.c    16 Jan 2015 06:39:59 -0000      1.21
+++ sbin/mount_cd9660/mount_cd9660.c    9 Jun 2015 17:27:57 -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.17
diff -u -p -r1.17 mount_ext2fs.c
--- sbin/mount_ext2fs/mount_ext2fs.c    16 Jan 2015 06:39:59 -0000      1.17
+++ sbin/mount_ext2fs/mount_ext2fs.c    9 Jun 2015 17:27:57 -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.21
diff -u -p -r1.21 mount_ffs.c
--- sbin/mount_ffs/mount_ffs.c  16 Jan 2015 06:39:59 -0000      1.21
+++ sbin/mount_ffs/mount_ffs.c  9 Jun 2015 17:27:57 -0000
@@ -70,7 +70,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.30
diff -u -p -r1.30 mount_msdos.c
--- sbin/mount_msdos/mount_msdos.c      18 Apr 2015 18:28:37 -0000      1.30
+++ sbin/mount_msdos/mount_msdos.c      9 Jun 2015 17:27:57 -0000
@@ -100,7 +100,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.5
diff -u -p -r1.5 mount_tmpfs.c
--- sbin/mount_tmpfs/mount_tmpfs.c      16 Jan 2015 06:39:59 -0000      1.5
+++ sbin/mount_tmpfs/mount_tmpfs.c      9 Jun 2015 17:27:57 -0000
@@ -131,7 +131,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.99
diff -u -p -r1.99 newfs.c
--- sbin/newfs/newfs.c  20 Jan 2015 18:22:21 -0000      1.99
+++ sbin/newfs/newfs.c  9 Jun 2015 17:27:57 -0000
@@ -294,7 +294,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.15
diff -u -p -r1.15 newfs_ext2fs.c
--- sbin/newfs_ext2fs/newfs_ext2fs.c    16 Jan 2015 06:40:00 -0000      1.15
+++ sbin/newfs_ext2fs/newfs_ext2fs.c    9 Jun 2015 17:27:57 -0000
@@ -204,7 +204,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.53
diff -u -p -r1.53 savecore.c
--- sbin/savecore/savecore.c    26 Apr 2015 01:23:19 -0000      1.53
+++ sbin/savecore/savecore.c    9 Jun 2015 17:27:57 -0000
@@ -156,7 +156,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.29
diff -u -p -r1.29 scsi.c
--- sbin/scsi/scsi.c    20 Nov 2014 15:22:39 -0000      1.29
+++ sbin/scsi/scsi.c    9 Jun 2015 17:27:57 -0000
@@ -142,7 +142,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.13
diff -u -p -r1.13 ttyflags.c
--- sbin/ttyflags/ttyflags.c    4 Dec 2012 02:27:00 -0000       1.13
+++ sbin/ttyflags/ttyflags.c    9 Jun 2015 17:27:57 -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.11
diff -u -p -r1.11 biff.c
--- usr.bin/biff/biff.c 27 Oct 2009 23:59:36 -0000      1.11
+++ usr.bin/biff/biff.c 9 Jun 2015 17:27:57 -0000
@@ -52,7 +52,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.28
diff -u -p -r1.28 cal.c
--- usr.bin/cal/cal.c   17 Mar 2015 19:31:30 -0000      1.28
+++ usr.bin/cal/cal.c   9 Jun 2015 17:27:57 -0000
@@ -165,7 +165,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.19
diff -u -p -r1.19 cap_mkdb.c
--- usr.bin/cap_mkdb/cap_mkdb.c 16 Jan 2015 06:40:06 -0000      1.19
+++ usr.bin/cap_mkdb/cap_mkdb.c 9 Jun 2015 17:27:57 -0000
@@ -89,7 +89,6 @@ main(int argc, char *argv[])
                case 'i':
                        info = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/chpass/chpass.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/chpass.c,v
retrieving revision 1.41
diff -u -p -r1.41 chpass.c
--- usr.bin/chpass/chpass.c     16 Jan 2015 06:40:06 -0000      1.41
+++ usr.bin/chpass/chpass.c     9 Jun 2015 17:27:57 -0000
@@ -103,7 +103,6 @@ main(int argc, char *argv[])
                        force_yp = 1;
                        break;
 #endif
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/cmp/cmp.c
===================================================================
RCS file: /cvs/src/usr.bin/cmp/cmp.c,v
retrieving revision 1.12
diff -u -p -r1.12 cmp.c
--- usr.bin/cmp/cmp.c   27 Oct 2009 23:59:36 -0000      1.12
+++ usr.bin/cmp/cmp.c   9 Jun 2015 17:27:57 -0000
@@ -65,7 +65,6 @@ main(int argc, char *argv[])
                case 's':               /* silent run */
                        sflag = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/col/col.c
===================================================================
RCS file: /cvs/src/usr.bin/col/col.c,v
retrieving revision 1.17
diff -u -p -r1.17 col.c
--- usr.bin/col/col.c   9 May 2015 20:36:18 -0000       1.17
+++ usr.bin/col/col.c   9 Jun 2015 17:27:57 -0000
@@ -136,7 +136,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.9
diff -u -p -r1.9 colrm.c
--- usr.bin/colrm/colrm.c       27 Oct 2009 23:59:36 -0000      1.9
+++ usr.bin/colrm/colrm.c       9 Jun 2015 17:27:57 -0000
@@ -54,7 +54,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch(ch) {
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/column/column.c
===================================================================
RCS file: /cvs/src/usr.bin/column/column.c,v
retrieving revision 1.19
diff -u -p -r1.19 column.c
--- usr.bin/column/column.c     22 May 2014 19:50:34 -0000      1.19
+++ usr.bin/column/column.c     9 Jun 2015 17:27:57 -0000
@@ -93,7 +93,6 @@ main(int argc, char *argv[])
                case 'x':
                        xflag = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/comm/comm.c
===================================================================
RCS file: /cvs/src/usr.bin/comm/comm.c,v
retrieving revision 1.8
diff -u -p -r1.8 comm.c
--- usr.bin/comm/comm.c 27 Oct 2009 23:59:37 -0000      1.8
+++ usr.bin/comm/comm.c 9 Jun 2015 17:27:57 -0000
@@ -77,7 +77,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.15
diff -u -p -r1.15 ctags.c
--- usr.bin/ctags/ctags.c       8 Feb 2015 23:40:34 -0000       1.15
+++ usr.bin/ctags/ctags.c       9 Jun 2015 17:27:57 -0000
@@ -109,7 +109,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.18
diff -u -p -r1.18 cut.c
--- usr.bin/cut/cut.c   2 Feb 2014 11:44:01 -0000       1.18
+++ usr.bin/cut/cut.c   9 Jun 2015 17:27:57 -0000
@@ -89,7 +89,6 @@ main(int argc, char *argv[])
                        break;
                case 'n':
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/du/du.c
===================================================================
RCS file: /cvs/src/usr.bin/du/du.c,v
retrieving revision 1.29
diff -u -p -r1.29 du.c
--- usr.bin/du/du.c     20 Oct 2014 22:13:11 -0000      1.29
+++ usr.bin/du/du.c     9 Jun 2015 17:27:57 -0000
@@ -113,7 +113,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.12
diff -u -p -r1.12 expand.c
--- usr.bin/expand/expand.c     26 Nov 2013 13:18:55 -0000      1.12
+++ usr.bin/expand/expand.c     9 Jun 2015 17:27:57 -0000
@@ -63,7 +63,6 @@ main(int argc, char *argv[])
                case 't':
                        getstops(optarg);
                        break;
-               case '?':
                default:
                        usage();
                        /* NOTREACHED */
Index: usr.bin/fgen/fgen.l
===================================================================
RCS file: /cvs/src/usr.bin/fgen/fgen.l,v
retrieving revision 1.10
diff -u -p -r1.10 fgen.l
--- usr.bin/fgen/fgen.l 30 Dec 2013 21:52:21 -0000      1.10
+++ usr.bin/fgen/fgen.l 9 Jun 2015 17:27:57 -0000
@@ -972,7 +972,6 @@ main(argc, argv)
                case 'o':
                        outfile = optarg;
                        break;
-               case '?':
                default:
                        warnx("Illegal argument: %c", ch);
                        usage(myname);
Index: usr.bin/find/main.c
===================================================================
RCS file: /cvs/src/usr.bin/find/main.c,v
retrieving revision 1.30
diff -u -p -r1.30 main.c
--- usr.bin/find/main.c 18 May 2014 08:10:00 -0000      1.30
+++ usr.bin/find/main.c 9 Jun 2015 17:27:57 -0000
@@ -98,7 +98,6 @@ main(int argc, char *argv[])
                        ftsoptions &= ~FTS_NOSTAT;
                        ftsoptions |= FTS_XDEV;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/finger/finger.c
===================================================================
RCS file: /cvs/src/usr.bin/finger/finger.c,v
retrieving revision 1.19
diff -u -p -r1.19 finger.c
--- usr.bin/finger/finger.c     16 Jan 2015 06:40:07 -0000      1.19
+++ usr.bin/finger/finger.c     9 Jun 2015 17:27:57 -0000
@@ -108,7 +108,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.17
diff -u -p -r1.17 gencat.c
--- usr.bin/gencat/gencat.c     18 Nov 2014 20:54:28 -0000      1.17
+++ usr.bin/gencat/gencat.c     9 Jun 2015 17:27:57 -0000
@@ -136,7 +136,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.17
diff -u -p -r1.17 getconf.c
--- usr.bin/getconf/getconf.c   22 Mar 2015 01:14:34 -0000      1.17
+++ usr.bin/getconf/getconf.c   9 Jun 2015 17:27:57 -0000
@@ -423,7 +423,6 @@ main(int argc, char *argv[])
                        if (! compilation_spec_valid(optarg))
                                errx(1, "%s: unknown specification", optarg);
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/id/id.c
===================================================================
RCS file: /cvs/src/usr.bin/id/id.c,v
retrieving revision 1.23
diff -u -p -r1.23 id.c
--- usr.bin/id/id.c     19 May 2015 16:03:19 -0000      1.23
+++ usr.bin/id/id.c     9 Jun 2015 17:27:57 -0000
@@ -98,7 +98,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.24
diff -u -p -r1.24 join.c
--- usr.bin/join/join.c 16 Jan 2015 06:40:08 -0000      1.24
+++ usr.bin/join/join.c 9 Jun 2015 17:27:57 -0000
@@ -181,7 +181,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.21
diff -u -p -r1.21 lastcomm.c
--- usr.bin/lastcomm/lastcomm.c 15 Mar 2015 00:41:28 -0000      1.21
+++ usr.bin/lastcomm/lastcomm.c 9 Jun 2015 17:27:57 -0000
@@ -75,7 +75,6 @@ main(int argc, char *argv[])
                case 'f':
                        acctfile = optarg;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/logger/logger.c
===================================================================
RCS file: /cvs/src/usr.bin/logger/logger.c,v
retrieving revision 1.14
diff -u -p -r1.14 logger.c
--- usr.bin/logger/logger.c     18 Apr 2015 18:28:37 -0000      1.14
+++ usr.bin/logger/logger.c     9 Jun 2015 17:27:57 -0000
@@ -81,7 +81,6 @@ main(int argc, char *argv[])
                case 't':               /* tag */
                        tag = optarg;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/logname/logname.c
===================================================================
RCS file: /cvs/src/usr.bin/logname/logname.c,v
retrieving revision 1.7
diff -u -p -r1.7 logname.c
--- usr.bin/logname/logname.c   27 Oct 2009 23:59:40 -0000      1.7
+++ usr.bin/logname/logname.c   9 Jun 2015 17:27:57 -0000
@@ -48,7 +48,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch (ch) {
-               case '?':
                default:
                        usage();
                        /* NOTREACHED */
Index: usr.bin/look/look.c
===================================================================
RCS file: /cvs/src/usr.bin/look/look.c,v
retrieving revision 1.16
diff -u -p -r1.16 look.c
--- usr.bin/look/look.c 6 Feb 2015 23:21:59 -0000       1.16
+++ usr.bin/look/look.c 9 Jun 2015 17:27:57 -0000
@@ -101,7 +101,6 @@ main(int argc, char *argv[])
                case 't':
                        termchar = *optarg;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/mesg/mesg.c
===================================================================
RCS file: /cvs/src/usr.bin/mesg/mesg.c,v
retrieving revision 1.8
diff -u -p -r1.8 mesg.c
--- usr.bin/mesg/mesg.c 27 Oct 2009 23:59:40 -0000      1.8
+++ usr.bin/mesg/mesg.c 9 Jun 2015 17:27:57 -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/midiplay/midiplay.c
===================================================================
RCS file: /cvs/src/usr.bin/midiplay/midiplay.c,v
retrieving revision 1.17
diff -u -p -r1.17 midiplay.c
--- usr.bin/midiplay/midiplay.c 8 Feb 2015 23:40:34 -0000       1.17
+++ usr.bin/midiplay/midiplay.c 9 Jun 2015 17:27:57 -0000
@@ -413,7 +413,7 @@ main(int argc, char **argv)
        struct sigaction sa;
        struct itimerval it;
 
-       while ((ch = getopt(argc, argv, "?d:f:glmqt:vx")) != -1) {
+       while ((ch = getopt(argc, argv, "d:f:glmqt:vx")) != -1) {
                switch (ch) {
                case 'f':
                        file = optarg;
@@ -439,7 +439,6 @@ main(int argc, char **argv)
                case 'x':
                        example = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/netstat/main.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/main.c,v
retrieving revision 1.106
diff -u -p -r1.106 main.c
--- usr.bin/netstat/main.c      12 Feb 2015 01:49:02 -0000      1.106
+++ usr.bin/netstat/main.c      9 Jun 2015 17:27:57 -0000
@@ -256,7 +256,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.34
diff -u -p -r1.34 nfsstat.c
--- usr.bin/nfsstat/nfsstat.c   16 Jan 2015 06:40:10 -0000      1.34
+++ usr.bin/nfsstat/nfsstat.c   9 Jun 2015 17:27:57 -0000
@@ -105,7 +105,6 @@ main(int argc, char *argv[])
                case 'c':
                        display = SHOW_CLIENT;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/nice/nice.c
===================================================================
RCS file: /cvs/src/usr.bin/nice/nice.c,v
retrieving revision 1.14
diff -u -p -r1.14 nice.c
--- usr.bin/nice/nice.c 13 Feb 2014 20:51:10 -0000      1.14
+++ usr.bin/nice/nice.c 9 Jun 2015 17:27:57 -0000
@@ -70,7 +70,6 @@ main(int argc, char *argv[])
                        if (errstr)
                                errx(1, "increment is %s", errstr);
                        break;
-               case '?':
                default:
                        usage();
                        break;
Index: usr.bin/nl/nl.c
===================================================================
RCS file: /cvs/src/usr.bin/nl/nl.c,v
retrieving revision 1.4
diff -u -p -r1.4 nl.c
--- usr.bin/nl/nl.c     21 Jan 2015 22:28:09 -0000      1.4
+++ usr.bin/nl/nl.c     9 Jun 2015 17:27:57 -0000
@@ -193,7 +193,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.46
diff -u -p -r1.46 nm.c
--- usr.bin/nm/nm.c     17 May 2015 21:41:50 -0000      1.46
+++ usr.bin/nm/nm.c     9 Jun 2015 17:27:57 -0000
@@ -188,7 +188,6 @@ main(int argc, char *argv[])
                                print_totals = 1;
                                break;
                        }
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/paste/paste.c
===================================================================
RCS file: /cvs/src/usr.bin/paste/paste.c,v
retrieving revision 1.19
diff -u -p -r1.19 paste.c
--- usr.bin/paste/paste.c       25 Nov 2014 10:20:24 -0000      1.19
+++ usr.bin/paste/paste.c       9 Jun 2015 17:27:57 -0000
@@ -66,7 +66,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.30
diff -u -p -r1.30 rdist.c
--- usr.bin/rdist/rdist.c       8 Feb 2015 23:40:34 -0000       1.30
+++ usr.bin/rdist/rdist.c       9 Jun 2015 17:27:57 -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     9 Jun 2015 17:27:57 -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/rev/rev.c
===================================================================
RCS file: /cvs/src/usr.bin/rev/rev.c,v
retrieving revision 1.10
diff -u -p -r1.10 rev.c
--- usr.bin/rev/rev.c   27 Oct 2009 23:59:42 -0000      1.10
+++ usr.bin/rev/rev.c   9 Jun 2015 17:27:57 -0000
@@ -51,7 +51,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch(ch) {
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/ssh/ssh-keygen.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-keygen.c,v
retrieving revision 1.274
diff -u -p -r1.274 ssh-keygen.c
--- usr.bin/ssh/ssh-keygen.c    28 May 2015 07:37:31 -0000      1.274
+++ usr.bin/ssh/ssh-keygen.c    9 Jun 2015 17:27:57 -0000
@@ -2443,7 +2443,6 @@ main(int argc, char **argv)
                                    optarg, errstr);
                        break;
 #endif /* WITH_OPENSSL */
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/ssh/ssh-keyscan.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-keyscan.c,v
retrieving revision 1.101
diff -u -p -r1.101 ssh-keyscan.c
--- usr.bin/ssh/ssh-keyscan.c   10 Apr 2015 00:08:55 -0000      1.101
+++ usr.bin/ssh/ssh-keyscan.c   9 Jun 2015 17:27:57 -0000
@@ -712,7 +712,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.450
diff -u -p -r1.450 sshd.c
--- usr.bin/ssh/sshd.c  24 May 2015 23:39:16 -0000      1.450
+++ usr.bin/ssh/sshd.c  9 Jun 2015 17:27:57 -0000
@@ -1524,7 +1524,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.17
diff -u -p -r1.17 tail.c
--- usr.bin/tail/tail.c 27 Oct 2009 23:59:44 -0000      1.17
+++ usr.bin/tail/tail.c 9 Jun 2015 17:27:57 -0000
@@ -113,7 +113,6 @@ main(int argc, char *argv[])
                case 'r':
                        rflag = 1;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/tee/tee.c
===================================================================
RCS file: /cvs/src/usr.bin/tee/tee.c,v
retrieving revision 1.8
diff -u -p -r1.8 tee.c
--- usr.bin/tee/tee.c   23 Apr 2013 17:48:17 -0000      1.8
+++ usr.bin/tee/tee.c   9 Jun 2015 17:27:57 -0000
@@ -83,7 +83,6 @@ main(int argc, char *argv[])
                case 'i':
                        (void)signal(SIGINT, SIG_IGN);
                        break;
-               case '?':
                default:
                        (void)fprintf(stderr, "usage: tee [-ai] [file ...]\n");
                        exit(1);
Index: usr.bin/telnet/main.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/main.c,v
retrieving revision 1.30
diff -u -p -r1.30 main.c
--- usr.bin/telnet/main.c       22 Jul 2014 07:30:24 -0000      1.30
+++ usr.bin/telnet/main.c       9 Jun 2015 17:27:57 -0000
@@ -160,7 +160,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.21
diff -u -p -r1.21 tput.c
--- usr.bin/tput/tput.c 16 Jan 2015 06:40:13 -0000      1.21
+++ usr.bin/tput/tput.c 9 Jun 2015 17:27:57 -0000
@@ -86,7 +86,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.17
diff -u -p -r1.17 tr.c
--- usr.bin/tr/tr.c     3 Jun 2014 20:57:23 -0000       1.17
+++ usr.bin/tr/tr.c     9 Jun 2015 17:27:57 -0000
@@ -100,7 +100,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.36
diff -u -p -r1.36 tset.c
--- usr.bin/tset/tset.c 18 Sep 2013 16:21:30 -0000      1.36
+++ usr.bin/tset/tset.c 9 Jun 2015 17:27:57 -0000
@@ -1212,7 +1212,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.7
diff -u -p -r1.7 tty.c
--- usr.bin/tty/tty.c   27 Nov 2013 13:32:02 -0000      1.7
+++ usr.bin/tty/tty.c   9 Jun 2015 17:27:57 -0000
@@ -48,7 +48,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.12
diff -u -p -r1.12 unvis.c
--- usr.bin/unvis/unvis.c       22 Jan 2014 09:45:21 -0000      1.12
+++ usr.bin/unvis/unvis.c       9 Jun 2015 17:27:57 -0000
@@ -45,7 +45,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/usbhidaction/usbhidaction.c
===================================================================
RCS file: /cvs/src/usr.bin/usbhidaction/usbhidaction.c,v
retrieving revision 1.19
diff -u -p -r1.19 usbhidaction.c
--- usr.bin/usbhidaction/usbhidaction.c 18 Jan 2015 17:18:08 -0000      1.19
+++ usr.bin/usbhidaction/usbhidaction.c 9 Jun 2015 17:27:57 -0000
@@ -112,7 +112,6 @@ main(int argc, char **argv)
                        demon = 0;
                        verbose++;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/usbhidctl/usbhid.c
===================================================================
RCS file: /cvs/src/usr.bin/usbhidctl/usbhid.c,v
retrieving revision 1.11
diff -u -p -r1.11 usbhid.c
--- usr.bin/usbhidctl/usbhid.c  27 Nov 2013 00:13:23 -0000      1.11
+++ usr.bin/usbhidctl/usbhid.c  9 Jun 2015 17:27:57 -0000
@@ -780,7 +780,7 @@ main(int argc, char **argv)
        wflag = aflag = nflag = verbose = rflag = lflag = 0;
        dev = NULL;
        table = NULL;
-       while ((ch = getopt(argc, argv, "?af:lnrt:vw")) != -1) {
+       while ((ch = getopt(argc, argv, "af:lnrt:vw")) != -1) {
                switch (ch) {
                case 'a':
                        aflag = 1;
@@ -806,7 +806,6 @@ main(int argc, char **argv)
                case 'w':
                        wflag = 1;
                        break;
-               case '?':
                default:
                        usage();
                        /* NOTREACHED */
Index: usr.bin/users/users.c
===================================================================
RCS file: /cvs/src/usr.bin/users/users.c,v
retrieving revision 1.11
diff -u -p -r1.11 users.c
--- usr.bin/users/users.c       8 Oct 2014 04:11:28 -0000       1.11
+++ usr.bin/users/users.c       9 Jun 2015 17:27:57 -0000
@@ -55,7 +55,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/uuencode/uuencode.c
===================================================================
RCS file: /cvs/src/usr.bin/uuencode/uuencode.c,v
retrieving revision 1.11
diff -u -p -r1.11 uuencode.c
--- usr.bin/uuencode/uuencode.c 16 Jan 2015 06:40:13 -0000      1.11
+++ usr.bin/uuencode/uuencode.c 9 Jun 2015 17:27:57 -0000
@@ -90,7 +90,6 @@ main(int argc, char *argv[])
                case 'o':
                        outfile = optarg;
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.bin/vi/common/main.c
===================================================================
RCS file: /cvs/src/usr.bin/vi/common/main.c,v
retrieving revision 1.26
diff -u -p -r1.26 main.c
--- usr.bin/vi/common/main.c    20 Nov 2014 08:50:53 -0000      1.26
+++ usr.bin/vi/common/main.c    9 Jun 2015 17:27:57 -0000
@@ -210,7 +210,6 @@ editor(GS *gp, int argc, char *argv[])
                case 'w':
                        wsizearg = optarg;
                        break;
-               case '?':
                default:
                        (void)gp->scr_usage();
                        return (1);
Index: usr.bin/vis/vis.c
===================================================================
RCS file: /cvs/src/usr.bin/vis/vis.c,v
retrieving revision 1.17
diff -u -p -r1.17 vis.c
--- usr.bin/vis/vis.c   18 Apr 2015 18:28:38 -0000      1.17
+++ usr.bin/vis/vis.c   9 Jun 2015 17:27:57 -0000
@@ -99,7 +99,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.138
diff -u -p -r1.138 vmstat.c
--- usr.bin/vmstat/vmstat.c     18 Apr 2015 18:28:38 -0000      1.138
+++ usr.bin/vmstat/vmstat.c     9 Jun 2015 17:27:57 -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.58
diff -u -p -r1.58 w.c
--- usr.bin/w/w.c       15 Mar 2015 00:41:28 -0000      1.58
+++ usr.bin/w/w.c       9 Jun 2015 17:27:57 -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.17
diff -u -p -r1.17 wc.c
--- usr.bin/wc/wc.c     16 Jan 2015 06:40:14 -0000      1.17
+++ usr.bin/wc/wc.c     9 Jun 2015 17:27:57 -0000
@@ -72,7 +72,6 @@ main(int argc, char *argv[])
                case 'h':
                        humanchar = 1;
                        break;
-               case '?':
                default:
                        (void)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.29
diff -u -p -r1.29 xargs.c
--- usr.bin/xargs/xargs.c       18 Apr 2015 18:28:38 -0000      1.29
+++ usr.bin/xargs/xargs.c       9 Jun 2015 17:27:57 -0000
@@ -170,7 +170,6 @@ main(int argc, char *argv[])
                case '0':
                        zflag = 1;
                        break;
-               case '?':
                default:
                        usage();
        }
Index: usr.bin/xinstall/xinstall.c
===================================================================
RCS file: /cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.59
diff -u -p -r1.59 xinstall.c
--- usr.bin/xinstall/xinstall.c 18 Apr 2015 03:15:46 -0000      1.59
+++ usr.bin/xinstall/xinstall.c 9 Jun 2015 17:27:57 -0000
@@ -134,7 +134,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.23
diff -u -p -r1.23 ac.c
--- usr.sbin/ac/ac.c    9 Feb 2015 23:00:14 -0000       1.23
+++ usr.sbin/ac/ac.c    9 Jun 2015 17:27:57 -0000
@@ -220,7 +220,6 @@ main(int argc, char *argv[])
                case 'w':
                        fp = file(optarg);
                        break;
-               case '?':
                default:
                        usage();
                        break;
Index: usr.sbin/accton/accton.c
===================================================================
RCS file: /cvs/src/usr.sbin/accton/accton.c,v
retrieving revision 1.8
diff -u -p -r1.8 accton.c
--- usr.sbin/accton/accton.c    27 Oct 2009 23:59:50 -0000      1.8
+++ usr.sbin/accton/accton.c    9 Jun 2015 17:27:57 -0000
@@ -50,7 +50,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch(ch) {
-               case '?':
                default:
                        usage();
                }
Index: usr.sbin/apmd/apmd.c
===================================================================
RCS file: /cvs/src/usr.sbin/apmd/apmd.c,v
retrieving revision 1.75
diff -u -p -r1.75 apmd.c
--- usr.sbin/apmd/apmd.c        6 Feb 2015 08:16:50 -0000       1.75
+++ usr.sbin/apmd/apmd.c        9 Jun 2015 17:27:57 -0000
@@ -403,7 +403,6 @@ main(int argc, char *argv[])
                        doperf = PERF_MANUAL;
                        setperfpolicy("high");
                        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.13
diff -u -p -r1.13 dev_mkdb.c
--- usr.sbin/dev_mkdb/dev_mkdb.c        16 Jan 2015 06:40:16 -0000      1.13
+++ usr.sbin/dev_mkdb/dev_mkdb.c        9 Jun 2015 17:27:57 -0000
@@ -63,7 +63,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1)
                switch(ch) {
-               case '?':
                default:
                        usage();
                }
Index: usr.sbin/eeprom/main.c
===================================================================
RCS file: /cvs/src/usr.sbin/eeprom/main.c,v
retrieving revision 1.22
diff -u -p -r1.22 main.c
--- usr.sbin/eeprom/main.c      11 Mar 2015 18:12:27 -0000      1.22
+++ usr.sbin/eeprom/main.c      9 Jun 2015 17:27:57 -0000
@@ -145,7 +145,6 @@ main(int argc, char *argv[])
                        break;
 #endif /* __sparc__ && !__sparc64__ */
 
-               case '?':
                default:
                        usage();
                }
Index: usr.sbin/fdformat/fdformat.c
===================================================================
RCS file: /cvs/src/usr.sbin/fdformat/fdformat.c,v
retrieving revision 1.20
diff -u -p -r1.20 fdformat.c
--- usr.sbin/fdformat/fdformat.c        18 Apr 2015 18:28:38 -0000      1.20
+++ usr.sbin/fdformat/fdformat.c        9 Jun 2015 17:27:57 -0000
@@ -253,7 +253,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.12
diff -u -p -r1.12 hotplugd.c
--- usr.sbin/hotplugd/hotplugd.c        10 Jan 2010 13:20:41 -0000      1.12
+++ usr.sbin/hotplugd/hotplugd.c        9 Jun 2015 17:27:57 -0000
@@ -66,7 +66,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.143
diff -u -p -r1.143 inetd.c
--- usr.sbin/inetd/inetd.c      16 Jan 2015 06:40:17 -0000      1.143
+++ usr.sbin/inetd/inetd.c      9 Jun 2015 17:27:57 -0000
@@ -317,7 +317,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.38
diff -u -p -r1.38 iostat.c
--- usr.sbin/iostat/iostat.c    18 Mar 2015 15:14:47 -0000      1.38
+++ usr.sbin/iostat/iostat.c    9 Jun 2015 17:27:57 -0000
@@ -150,7 +150,6 @@ main(int argc, char *argv[])
                        if (errstr)
                                errx(1, "interval 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.22
diff -u -p -r1.22 lpq.c
--- usr.sbin/lpr/lpq/lpq.c      9 Feb 2015 23:00:14 -0000       1.22
+++ usr.sbin/lpr/lpq/lpq.c      9 Jun 2015 17:27:57 -0000
@@ -105,7 +105,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/mtree/mtree.c
===================================================================
RCS file: /cvs/src/usr.sbin/mtree/mtree.c,v
retrieving revision 1.22
diff -u -p -r1.22 mtree.c
--- usr.sbin/mtree/mtree.c      16 Jan 2015 06:40:18 -0000      1.22
+++ usr.sbin/mtree/mtree.c      9 Jun 2015 17:27:57 -0000
@@ -123,7 +123,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.17
diff -u -p -r1.17 netgroup_mkdb.c
--- usr.sbin/netgroup_mkdb/netgroup_mkdb.c      16 Jan 2015 15:40:16 -0000      
1.17
+++ usr.sbin/netgroup_mkdb/netgroup_mkdb.c      9 Jun 2015 17:27:57 -0000
@@ -110,7 +110,6 @@ main(int argc, char *argv[])
                        dbname = optarg;
                        break;
 
-               case '?':
                default:
                        usage();
                }
Index: usr.sbin/npppd/npppd/npppd.c
===================================================================
RCS file: /cvs/src/usr.sbin/npppd/npppd/npppd.c,v
retrieving revision 1.40
diff -u -p -r1.40 npppd.c
--- usr.sbin/npppd/npppd/npppd.c        19 Jan 2015 01:48:59 -0000      1.40
+++ usr.sbin/npppd/npppd/npppd.c        9 Jun 2015 17:27:57 -0000
@@ -157,7 +157,6 @@ main(int argc, char *argv[])
                        debuglevel++;
                        runasdaemon = 0;
                        break;
-               case '?':
                case 'h':
                        usage();
                        exit(1);
Index: usr.sbin/pwd_mkdb/pwd_mkdb.c
===================================================================
RCS file: /cvs/src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v
retrieving revision 1.48
diff -u -p -r1.48 pwd_mkdb.c
--- usr.sbin/pwd_mkdb/pwd_mkdb.c        24 Apr 2015 21:14:48 -0000      1.48
+++ usr.sbin/pwd_mkdb/pwd_mkdb.c        9 Jun 2015 17:27:57 -0000
@@ -131,7 +131,6 @@ main(int argc, char **argv)
                        break;
                case 'v':                       /* backward compatible */
                        break;
-               case '?':
                default:
                        usage();
                }
Index: usr.sbin/sa/main.c
===================================================================
RCS file: /cvs/src/usr.sbin/sa/main.c,v
retrieving revision 1.13
diff -u -p -r1.13 main.c
--- usr.sbin/sa/main.c  18 Apr 2015 18:28:38 -0000      1.13
+++ usr.sbin/sa/main.c  9 Jun 2015 17:27:57 -0000
@@ -162,7 +162,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/usbdevs/usbdevs.c
===================================================================
RCS file: /cvs/src/usr.sbin/usbdevs/usbdevs.c,v
retrieving revision 1.24
diff -u -p -r1.24 usbdevs.c
--- usr.sbin/usbdevs/usbdevs.c  31 Mar 2015 13:38:27 -0000      1.24
+++ usr.sbin/usbdevs/usbdevs.c  9 Jun 2015 17:27:57 -0000
@@ -187,7 +187,7 @@ main(int argc, char **argv)
        int addr = 0;
        int ncont;
 
-       while ((ch = getopt(argc, argv, "a:df:v?")) != -1) {
+       while ((ch = getopt(argc, argv, "a:df:v")) != -1) {
                switch (ch) {
                case 'a':
                        addr = strtonum(optarg, 1, USB_MAX_DEVICES, &errstr);
Index: usr.sbin/vipw/vipw.c
===================================================================
RCS file: /cvs/src/usr.sbin/vipw/vipw.c,v
retrieving revision 1.17
diff -u -p -r1.17 vipw.c
--- usr.sbin/vipw/vipw.c        7 May 2014 21:20:06 -0000       1.17
+++ usr.sbin/vipw/vipw.c        9 Jun 2015 17:27:57 -0000
@@ -53,7 +53,6 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "")) != -1) {
                switch (ch) {
-               case '?':
                default:
                        usage();
                }
Index: usr.sbin/wsconscfg/wsconscfg.c
===================================================================
RCS file: /cvs/src/usr.sbin/wsconscfg/wsconscfg.c,v
retrieving revision 1.14
diff -u -p -r1.14 wsconscfg.c
--- usr.sbin/wsconscfg/wsconscfg.c      9 Feb 2015 23:00:15 -0000       1.14
+++ usr.sbin/wsconscfg/wsconscfg.c      9 Jun 2015 17:27:57 -0000
@@ -104,7 +104,6 @@ main(int argc, char *argv[])
                case 'F':
                        dsd.flags |= WSDISPLAY_DELSCR_FORCE;
                        break;
-               case '?':
                default:
                        usage();
                        break;
Index: usr.sbin/wsfontload/wsfontload.c
===================================================================
RCS file: /cvs/src/usr.sbin/wsfontload/wsfontload.c,v
retrieving revision 1.14
diff -u -p -r1.14 wsfontload.c
--- usr.sbin/wsfontload/wsfontload.c    9 Feb 2015 23:00:15 -0000       1.14
+++ usr.sbin/wsfontload/wsfontload.c    9 Jun 2015 17:27:57 -0000
@@ -127,7 +127,6 @@ main(int argc, char *argv[])
                case 'B':
                        f.byteorder = WSDISPLAY_FONTORDER_R2L;
                        break;
-               case '?':
                default:
                        usage();
                        break;

Reply via email to