Part2: remove superfluous case '?': from /usr/bin utils

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Part2: remove superfluous case '?': from /usr/bin utils

Benjamin Baier
Hello tech@

Part 2 for /usr/bin
Also adjust getopt(3)'s optstring in midiplay.c and usbhid.c

Greetings Ben

Index: biff/biff.c
===================================================================
RCS file: /cvs/src/usr.bin/biff/biff.c,v
retrieving revision 1.13
diff -u -p -r1.13 biff.c
--- biff/biff.c 12 Oct 2015 20:03:24 -0000 1.13
+++ biff/biff.c 8 Nov 2015 09:38:05 -0000
@@ -54,7 +54,6 @@ main(int argc, char *argv[])
 
  while ((ch = getopt(argc, argv, "")) != -1)
  switch(ch) {
- case '?':
  default:
  usage();
  }
Index: cal/cal.c
===================================================================
RCS file: /cvs/src/usr.bin/cal/cal.c,v
retrieving revision 1.30
diff -u -p -r1.30 cal.c
--- cal/cal.c 9 Oct 2015 01:37:06 -0000 1.30
+++ cal/cal.c 8 Nov 2015 09:38:05 -0000
@@ -168,7 +168,6 @@ main(int argc, char *argv[])
  case 'y':
  yflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: cap_mkdb/cap_mkdb.c
===================================================================
RCS file: /cvs/src/usr.bin/cap_mkdb/cap_mkdb.c,v
retrieving revision 1.20
diff -u -p -r1.20 cap_mkdb.c
--- cap_mkdb/cap_mkdb.c 29 Oct 2015 02:58:00 -0000 1.20
+++ cap_mkdb/cap_mkdb.c 8 Nov 2015 09:38:05 -0000
@@ -92,7 +92,6 @@ main(int argc, char *argv[])
  case 'i':
  info = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: chpass/chpass.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/chpass.c,v
retrieving revision 1.41
diff -u -p -r1.41 chpass.c
--- chpass/chpass.c 16 Jan 2015 06:40:06 -0000 1.41
+++ chpass/chpass.c 8 Nov 2015 09:38:05 -0000
@@ -103,7 +103,6 @@ main(int argc, char *argv[])
  force_yp = 1;
  break;
 #endif
- case '?':
  default:
  usage();
  }
Index: cmp/cmp.c
===================================================================
RCS file: /cvs/src/usr.bin/cmp/cmp.c,v
retrieving revision 1.13
diff -u -p -r1.13 cmp.c
--- cmp/cmp.c 10 Oct 2015 05:35:22 -0000 1.13
+++ cmp/cmp.c 8 Nov 2015 09:38:05 -0000
@@ -68,7 +68,6 @@ main(int argc, char *argv[])
  case 's': /* silent run */
  sflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: col/col.c
===================================================================
RCS file: /cvs/src/usr.bin/col/col.c,v
retrieving revision 1.19
diff -u -p -r1.19 col.c
--- col/col.c 9 Oct 2015 01:37:06 -0000 1.19
+++ col/col.c 8 Nov 2015 09:38:05 -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: colrm/colrm.c
===================================================================
RCS file: /cvs/src/usr.bin/colrm/colrm.c,v
retrieving revision 1.11
diff -u -p -r1.11 colrm.c
--- colrm/colrm.c 9 Oct 2015 01:37:06 -0000 1.11
+++ colrm/colrm.c 8 Nov 2015 09:38:05 -0000
@@ -57,7 +57,6 @@ main(int argc, char *argv[])
 
  while ((ch = getopt(argc, argv, "")) != -1)
  switch(ch) {
- case '?':
  default:
  usage();
  }
Index: column/column.c
===================================================================
RCS file: /cvs/src/usr.bin/column/column.c,v
retrieving revision 1.22
diff -u -p -r1.22 column.c
--- column/column.c 3 Nov 2015 04:55:44 -0000 1.22
+++ column/column.c 8 Nov 2015 09:38:05 -0000
@@ -96,7 +96,6 @@ main(int argc, char *argv[])
  case 'x':
  xflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: comm/comm.c
===================================================================
RCS file: /cvs/src/usr.bin/comm/comm.c,v
retrieving revision 1.10
diff -u -p -r1.10 comm.c
--- comm/comm.c 9 Oct 2015 01:37:07 -0000 1.10
+++ comm/comm.c 8 Nov 2015 09:38:05 -0000
@@ -80,7 +80,6 @@ main(int argc, char *argv[])
  case 'f':
  compare = strcasecmp;
  break;
- case '?':
  default:
  usage();
  }
Index: ctags/ctags.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/ctags.c,v
retrieving revision 1.18
diff -u -p -r1.18 ctags.c
--- ctags/ctags.c 9 Oct 2015 01:37:07 -0000 1.18
+++ ctags/ctags.c 8 Nov 2015 09:38:05 -0000
@@ -112,7 +112,6 @@ main(int argc, char *argv[])
  case 'x':
  xflag = 1;
  break;
- case '?':
  default:
  goto usage;
  }
Index: cut/cut.c
===================================================================
RCS file: /cvs/src/usr.bin/cut/cut.c,v
retrieving revision 1.22
diff -u -p -r1.22 cut.c
--- cut/cut.c 3 Nov 2015 04:57:20 -0000 1.22
+++ cut/cut.c 8 Nov 2015 09:38:05 -0000
@@ -92,7 +92,6 @@ main(int argc, char *argv[])
  break;
  case 'n':
  break;
- case '?':
  default:
  usage();
  }
Index: du/du.c
===================================================================
RCS file: /cvs/src/usr.bin/du/du.c,v
retrieving revision 1.31
diff -u -p -r1.31 du.c
--- du/du.c 10 Oct 2015 05:32:52 -0000 1.31
+++ du/du.c 8 Nov 2015 09:38:05 -0000
@@ -116,7 +116,6 @@ main(int argc, char *argv[])
  case 'x':
  ftsoptions |= FTS_XDEV;
  break;
- case '?':
  default:
  usage();
  }
Index: expand/expand.c
===================================================================
RCS file: /cvs/src/usr.bin/expand/expand.c,v
retrieving revision 1.14
diff -u -p -r1.14 expand.c
--- expand/expand.c 9 Oct 2015 01:37:07 -0000 1.14
+++ expand/expand.c 8 Nov 2015 09:38:05 -0000
@@ -66,7 +66,6 @@ main(int argc, char *argv[])
  case 't':
  getstops(optarg);
  break;
- case '?':
  default:
  usage();
  /* NOTREACHED */
Index: fgen/fgen.l
===================================================================
RCS file: /cvs/src/usr.bin/fgen/fgen.l,v
retrieving revision 1.12
diff -u -p -r1.12 fgen.l
--- fgen/fgen.l 9 Oct 2015 01:37:07 -0000 1.12
+++ fgen/fgen.l 8 Nov 2015 09:38:05 -0000
@@ -975,7 +975,6 @@ main(argc, argv)
  case 'o':
  outfile = optarg;
  break;
- case '?':
  default:
  warnx("Illegal argument: %c", ch);
  usage(myname);
Index: find/main.c
===================================================================
RCS file: /cvs/src/usr.bin/find/main.c,v
retrieving revision 1.30
diff -u -p -r1.30 main.c
--- find/main.c 18 May 2014 08:10:00 -0000 1.30
+++ find/main.c 8 Nov 2015 09:38:05 -0000
@@ -98,7 +98,6 @@ main(int argc, char *argv[])
  ftsoptions &= ~FTS_NOSTAT;
  ftsoptions |= FTS_XDEV;
  break;
- case '?':
  default:
  usage();
  }
Index: finger/finger.c
===================================================================
RCS file: /cvs/src/usr.bin/finger/finger.c,v
retrieving revision 1.26
diff -u -p -r1.26 finger.c
--- finger/finger.c 3 Nov 2015 05:13:35 -0000 1.26
+++ finger/finger.c 8 Nov 2015 09:38:05 -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: gencat/gencat.c
===================================================================
RCS file: /cvs/src/usr.bin/gencat/gencat.c,v
retrieving revision 1.18
diff -u -p -r1.18 gencat.c
--- gencat/gencat.c 10 Oct 2015 21:29:59 -0000 1.18
+++ gencat/gencat.c 8 Nov 2015 09:38:05 -0000
@@ -139,7 +139,6 @@ main(int argc, char *argv[])
 
  while ((c = getopt(argc, argv, "")) != -1) {
  switch (c) {
- case '?':
  default:
  usage();
  /* NOTREACHED */
Index: getconf/getconf.c
===================================================================
RCS file: /cvs/src/usr.bin/getconf/getconf.c,v
retrieving revision 1.17
diff -u -p -r1.17 getconf.c
--- getconf/getconf.c 22 Mar 2015 01:14:34 -0000 1.17
+++ getconf/getconf.c 8 Nov 2015 09:38:05 -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: id/id.c
===================================================================
RCS file: /cvs/src/usr.bin/id/id.c,v
retrieving revision 1.26
diff -u -p -r1.26 id.c
--- id/id.c 9 Oct 2015 01:37:07 -0000 1.26
+++ id/id.c 8 Nov 2015 09:38:05 -0000
@@ -101,7 +101,6 @@ main(int argc, char *argv[])
  case 'u':
  uflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: join/join.c
===================================================================
RCS file: /cvs/src/usr.bin/join/join.c,v
retrieving revision 1.27
diff -u -p -r1.27 join.c
--- join/join.c 9 Oct 2015 01:37:07 -0000 1.27
+++ join/join.c 8 Nov 2015 09:38:05 -0000
@@ -184,7 +184,6 @@ main(int argc, char *argv[])
  if (*end)
  errx(1, "illegal file number -- %s", optarg);
  break;
- case '?':
  default:
  usage();
  }
Index: lastcomm/lastcomm.c
===================================================================
RCS file: /cvs/src/usr.bin/lastcomm/lastcomm.c,v
retrieving revision 1.23
diff -u -p -r1.23 lastcomm.c
--- lastcomm/lastcomm.c 9 Oct 2015 01:37:08 -0000 1.23
+++ lastcomm/lastcomm.c 8 Nov 2015 09:38:05 -0000
@@ -78,7 +78,6 @@ main(int argc, char *argv[])
  case 'f':
  acctfile = optarg;
  break;
- case '?':
  default:
  usage();
  }
Index: logger/logger.c
===================================================================
RCS file: /cvs/src/usr.bin/logger/logger.c,v
retrieving revision 1.16
diff -u -p -r1.16 logger.c
--- logger/logger.c 9 Oct 2015 01:37:08 -0000 1.16
+++ logger/logger.c 8 Nov 2015 09:38:05 -0000
@@ -82,7 +82,6 @@ main(int argc, char *argv[])
  case 't': /* tag */
  tag = optarg;
  break;
- case '?':
  default:
  usage();
  }
Index: logname/logname.c
===================================================================
RCS file: /cvs/src/usr.bin/logname/logname.c,v
retrieving revision 1.9
diff -u -p -r1.9 logname.c
--- logname/logname.c 9 Oct 2015 01:37:08 -0000 1.9
+++ logname/logname.c 8 Nov 2015 09:38:05 -0000
@@ -51,7 +51,6 @@ main(int argc, char *argv[])
 
  while ((ch = getopt(argc, argv, "")) != -1)
  switch (ch) {
- case '?':
  default:
  usage();
  /* NOTREACHED */
Index: look/look.c
===================================================================
RCS file: /cvs/src/usr.bin/look/look.c,v
retrieving revision 1.18
diff -u -p -r1.18 look.c
--- look/look.c 9 Oct 2015 01:37:08 -0000 1.18
+++ look/look.c 8 Nov 2015 09:38:05 -0000
@@ -104,7 +104,6 @@ main(int argc, char *argv[])
  case 't':
  termchar = *optarg;
  break;
- case '?':
  default:
  usage();
  }
Index: mesg/mesg.c
===================================================================
RCS file: /cvs/src/usr.bin/mesg/mesg.c,v
retrieving revision 1.10
diff -u -p -r1.10 mesg.c
--- mesg/mesg.c 12 Oct 2015 20:03:24 -0000 1.10
+++ mesg/mesg.c 8 Nov 2015 09:38:05 -0000
@@ -57,7 +57,6 @@ main(int argc, char *argv[])
 
  while ((ch = getopt(argc, argv, "")) != -1)
  switch (ch) {
- case '?':
  default:
  goto usage;
  }
Index: midiplay/midiplay.c
===================================================================
RCS file: /cvs/src/usr.bin/midiplay/midiplay.c,v
retrieving revision 1.17
diff -u -p -r1.17 midiplay.c
--- midiplay/midiplay.c 8 Feb 2015 23:40:34 -0000 1.17
+++ midiplay/midiplay.c 8 Nov 2015 09:38:05 -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: netstat/main.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/main.c,v
retrieving revision 1.108
diff -u -p -r1.108 main.c
--- netstat/main.c 23 Oct 2015 08:18:57 -0000 1.108
+++ netstat/main.c 8 Nov 2015 09:38:05 -0000
@@ -256,7 +256,6 @@ main(int argc, char *argv[])
  errx(1, "interval is %s", errstr);
  iflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: nfsstat/nfsstat.c
===================================================================
RCS file: /cvs/src/usr.bin/nfsstat/nfsstat.c,v
retrieving revision 1.35
diff -u -p -r1.35 nfsstat.c
--- nfsstat/nfsstat.c 23 Oct 2015 08:18:30 -0000 1.35
+++ nfsstat/nfsstat.c 8 Nov 2015 09:38:05 -0000
@@ -105,7 +105,6 @@ main(int argc, char *argv[])
  case 'c':
  display = SHOW_CLIENT;
  break;
- case '?':
  default:
  usage();
  }
Index: nl/nl.c
===================================================================
RCS file: /cvs/src/usr.bin/nl/nl.c,v
retrieving revision 1.6
diff -u -p -r1.6 nl.c
--- nl/nl.c 9 Oct 2015 01:37:08 -0000 1.6
+++ nl/nl.c 8 Nov 2015 09:39:22 -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: nm/nm.c
===================================================================
RCS file: /cvs/src/usr.bin/nm/nm.c,v
retrieving revision 1.49
diff -u -p -r1.49 nm.c
--- nm/nm.c 9 Oct 2015 01:37:08 -0000 1.49
+++ nm/nm.c 8 Nov 2015 09:43:51 -0000
@@ -200,7 +200,6 @@ main(int argc, char *argv[])
  usage();
  }
  break;
- case '?':
  default:
  usage();
  }
Index: paste/paste.c
===================================================================
RCS file: /cvs/src/usr.bin/paste/paste.c,v
retrieving revision 1.21
diff -u -p -r1.21 paste.c
--- paste/paste.c 9 Oct 2015 01:37:08 -0000 1.21
+++ paste/paste.c 8 Nov 2015 09:39:22 -0000
@@ -69,7 +69,6 @@ main(int argc, char *argv[])
  case 's':
  seq = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: rdist/rdist.c
===================================================================
RCS file: /cvs/src/usr.bin/rdist/rdist.c,v
retrieving revision 1.30
diff -u -p -r1.30 rdist.c
--- rdist/rdist.c 8 Feb 2015 23:40:34 -0000 1.30
+++ rdist/rdist.c 8 Nov 2015 09:39:22 -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: rdistd/rdistd.c
===================================================================
RCS file: /cvs/src/usr.bin/rdistd/rdistd.c,v
retrieving revision 1.10
diff -u -p -r1.10 rdistd.c
--- rdistd/rdistd.c 8 Feb 2015 23:40:34 -0000 1.10
+++ rdistd/rdistd.c 8 Nov 2015 09:39:22 -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: rev/rev.c
===================================================================
RCS file: /cvs/src/usr.bin/rev/rev.c,v
retrieving revision 1.12
diff -u -p -r1.12 rev.c
--- rev/rev.c 9 Oct 2015 01:37:08 -0000 1.12
+++ rev/rev.c 8 Nov 2015 09:39:22 -0000
@@ -54,7 +54,6 @@ main(int argc, char *argv[])
 
  while ((ch = getopt(argc, argv, "")) != -1)
  switch(ch) {
- case '?':
  default:
  usage();
  }
Index: ssh/ssh-keygen.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-keygen.c,v
retrieving revision 1.277
diff -u -p -r1.277 ssh-keygen.c
--- ssh/ssh-keygen.c 19 Aug 2015 23:17:51 -0000 1.277
+++ ssh/ssh-keygen.c 8 Nov 2015 09:39:22 -0000
@@ -2411,7 +2411,6 @@ main(int argc, char **argv)
     optarg, errstr);
  break;
 #endif /* WITH_OPENSSL */
- case '?':
  default:
  usage();
  }
Index: ssh/ssh-keyscan.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-keyscan.c,v
retrieving revision 1.102
diff -u -p -r1.102 ssh-keyscan.c
--- ssh/ssh-keyscan.c 24 Oct 2015 22:56:19 -0000 1.102
+++ ssh/ssh-keyscan.c 8 Nov 2015 09:39:22 -0000
@@ -727,7 +727,6 @@ main(int argc, char **argv)
  case '6':
  IPv4or6 = AF_INET6;
  break;
- case '?':
  default:
  usage();
  }
Index: ssh/sshd.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd.c,v
retrieving revision 1.459
diff -u -p -r1.459 sshd.c
--- ssh/sshd.c 4 Sep 2015 08:21:47 -0000 1.459
+++ ssh/sshd.c 8 Nov 2015 09:39:22 -0000
@@ -1528,7 +1528,6 @@ main(int ac, char **av)
  exit(1);
  free(line);
  break;
- case '?':
  default:
  usage();
  break;
Index: tail/tail.c
===================================================================
RCS file: /cvs/src/usr.bin/tail/tail.c,v
retrieving revision 1.19
diff -u -p -r1.19 tail.c
--- tail/tail.c 9 Oct 2015 01:37:09 -0000 1.19
+++ tail/tail.c 8 Nov 2015 09:39:22 -0000
@@ -116,7 +116,6 @@ main(int argc, char *argv[])
  case 'r':
  rflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: tee/tee.c
===================================================================
RCS file: /cvs/src/usr.bin/tee/tee.c,v
retrieving revision 1.10
diff -u -p -r1.10 tee.c
--- tee/tee.c 9 Oct 2015 01:37:09 -0000 1.10
+++ tee/tee.c 8 Nov 2015 09:39:22 -0000
@@ -86,7 +86,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: telnet/main.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/main.c,v
retrieving revision 1.30
diff -u -p -r1.30 main.c
--- telnet/main.c 22 Jul 2014 07:30:24 -0000 1.30
+++ telnet/main.c 8 Nov 2015 09:39:22 -0000
@@ -160,7 +160,6 @@ main(int argc, char *argv[])
     prompt, errstr, optarg);
  }
  break;
- case '?':
  default:
  usage();
  }
Index: tput/tput.c
===================================================================
RCS file: /cvs/src/usr.bin/tput/tput.c,v
retrieving revision 1.21
diff -u -p -r1.21 tput.c
--- tput/tput.c 16 Jan 2015 06:40:13 -0000 1.21
+++ tput/tput.c 8 Nov 2015 09:39:22 -0000
@@ -86,7 +86,6 @@ main(int argc, char *argv[])
  case 'S':
  Sflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: tr/tr.c
===================================================================
RCS file: /cvs/src/usr.bin/tr/tr.c,v
retrieving revision 1.19
diff -u -p -r1.19 tr.c
--- tr/tr.c 9 Oct 2015 01:37:09 -0000 1.19
+++ tr/tr.c 8 Nov 2015 09:39:22 -0000
@@ -103,7 +103,6 @@ main(int argc, char *argv[])
  case 's':
  sflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: tset/tset.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/tset.c,v
retrieving revision 1.37
diff -u -p -r1.37 tset.c
--- tset/tset.c 20 Aug 2015 22:28:58 -0000 1.37
+++ tset/tset.c 8 Nov 2015 09:39:22 -0000
@@ -1212,7 +1212,6 @@ main(int argc, char **argv)
  case 'w': /* set window-size */
     opt_w = TRUE;
     break;
- case '?':
  default:
     usage();
  }
Index: tty/tty.c
===================================================================
RCS file: /cvs/src/usr.bin/tty/tty.c,v
retrieving revision 1.10
diff -u -p -r1.10 tty.c
--- tty/tty.c 12 Oct 2015 19:56:47 -0000 1.10
+++ tty/tty.c 8 Nov 2015 09:39:22 -0000
@@ -52,7 +52,6 @@ main(int argc, char *argv[])
  case 's':
  sflag = 1;
  break;
- case '?':
  default:
  usage();
  /* NOTREACHED */
Index: unvis/unvis.c
===================================================================
RCS file: /cvs/src/usr.bin/unvis/unvis.c,v
retrieving revision 1.14
diff -u -p -r1.14 unvis.c
--- unvis/unvis.c 9 Oct 2015 01:37:09 -0000 1.14
+++ unvis/unvis.c 8 Nov 2015 09:39:22 -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: usbhidaction/usbhidaction.c
===================================================================
RCS file: /cvs/src/usr.bin/usbhidaction/usbhidaction.c,v
retrieving revision 1.21
diff -u -p -r1.21 usbhidaction.c
--- usbhidaction/usbhidaction.c 26 Oct 2015 10:08:14 -0000 1.21
+++ usbhidaction/usbhidaction.c 8 Nov 2015 09:39:22 -0000
@@ -111,7 +111,6 @@ main(int argc, char **argv)
  demon = 0;
  verbose++;
  break;
- case '?':
  default:
  usage();
  }
Index: usbhidctl/usbhid.c
===================================================================
RCS file: /cvs/src/usr.bin/usbhidctl/usbhid.c,v
retrieving revision 1.11
diff -u -p -r1.11 usbhid.c
--- usbhidctl/usbhid.c 27 Nov 2013 00:13:23 -0000 1.11
+++ usbhidctl/usbhid.c 8 Nov 2015 09:39:22 -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: users/users.c
===================================================================
RCS file: /cvs/src/usr.bin/users/users.c,v
retrieving revision 1.13
diff -u -p -r1.13 users.c
--- users/users.c 9 Oct 2015 01:37:09 -0000 1.13
+++ users/users.c 8 Nov 2015 09:39:22 -0000
@@ -58,7 +58,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: uuencode/uuencode.c
===================================================================
RCS file: /cvs/src/usr.bin/uuencode/uuencode.c,v
retrieving revision 1.13
diff -u -p -r1.13 uuencode.c
--- uuencode/uuencode.c 9 Oct 2015 01:37:09 -0000 1.13
+++ uuencode/uuencode.c 8 Nov 2015 09:39:22 -0000
@@ -90,7 +90,6 @@ main(int argc, char *argv[])
  case 'o':
  outfile = optarg;
  break;
- case '?':
  default:
  usage();
  }
Index: 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
--- vi/common/main.c 20 Nov 2014 08:50:53 -0000 1.26
+++ vi/common/main.c 8 Nov 2015 09:39:22 -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: vis/vis.c
===================================================================
RCS file: /cvs/src/usr.bin/vis/vis.c,v
retrieving revision 1.19
diff -u -p -r1.19 vis.c
--- vis/vis.c 9 Oct 2015 01:37:09 -0000 1.19
+++ vis/vis.c 8 Nov 2015 09:39:22 -0000
@@ -102,7 +102,6 @@ main(int argc, char *argv[])
  debug = 1;
  break;
 #endif
- case '?':
  default:
  usage();
  }
Index: vmstat/vmstat.c
===================================================================
RCS file: /cvs/src/usr.bin/vmstat/vmstat.c,v
retrieving revision 1.138
diff -u -p -r1.138 vmstat.c
--- vmstat/vmstat.c 18 Apr 2015 18:28:38 -0000 1.138
+++ vmstat/vmstat.c 8 Nov 2015 09:39:22 -0000
@@ -172,7 +172,6 @@ main(int argc, char *argv[])
  case 'z':
  zflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: w/w.c
===================================================================
RCS file: /cvs/src/usr.bin/w/w.c,v
retrieving revision 1.60
diff -u -p -r1.60 w.c
--- w/w.c 23 Oct 2015 03:26:24 -0000 1.60
+++ w/w.c 8 Nov 2015 09:39:22 -0000
@@ -151,7 +151,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: wc/wc.c
===================================================================
RCS file: /cvs/src/usr.bin/wc/wc.c,v
retrieving revision 1.19
diff -u -p -r1.19 wc.c
--- wc/wc.c 9 Oct 2015 01:37:09 -0000 1.19
+++ wc/wc.c 8 Nov 2015 09:39:22 -0000
@@ -75,7 +75,6 @@ main(int argc, char *argv[])
  case 'h':
  humanchar = 1;
  break;
- case '?':
  default:
  (void)fprintf(stderr,
     "usage: %s [-c | -m] [-hlw] [file ...]\n",
Index: xargs/xargs.c
===================================================================
RCS file: /cvs/src/usr.bin/xargs/xargs.c,v
retrieving revision 1.30
diff -u -p -r1.30 xargs.c
--- xargs/xargs.c 10 Oct 2015 15:52:30 -0000 1.30
+++ xargs/xargs.c 8 Nov 2015 09:39:22 -0000
@@ -174,7 +174,6 @@ main(int argc, char *argv[])
  case '0':
  zflag = 1;
  break;
- case '?':
  default:
  usage();
  }
Index: xinstall/xinstall.c
===================================================================
RCS file: /cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.62
diff -u -p -r1.62 xinstall.c
--- xinstall/xinstall.c 19 Jul 2015 18:27:26 -0000 1.62
+++ xinstall/xinstall.c 8 Nov 2015 09:39:22 -0000
@@ -138,7 +138,6 @@ main(int argc, char *argv[])
  case 'd':
  dodir = 1;
  break;
- case '?':
  default:
  usage();
  }