commit 2366164de74a83c8cddf2abd0f500152d9053a3a
Author: sin <[email protected]>
AuthorDate: Sun Nov 1 10:16:49 2015 +0000
Commit: sin <[email protected]>
CommitDate: Sun Nov 1 10:18:55 2015 +0000
No need for semicolon after ARGEND
This is also the style used in Plan 9.
diff --git a/cal.c b/cal.c
index 732917d..740dc02 100644
--- a/cal.c
+++ b/cal.c
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (nmons == 0) {
if (argc == 1) {
diff --git a/cat.c b/cat.c
index 8ba02a2..c36657d 100644
--- a/cat.c
+++ b/cat.c
@@ -24,7 +24,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc) {
concat(stdin, "<stdin>", stdout, "<stdout>");
diff --git a/chgrp.c b/chgrp.c
index 6bac45f..ee5c503 100644
--- a/chgrp.c
+++ b/chgrp.c
@@ -61,7 +61,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc < 2)
usage();
diff --git a/chown.c b/chown.c
index a31bdbc..f06d541 100644
--- a/chown.c
+++ b/chown.c
@@ -67,7 +67,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc < 2)
usage();
diff --git a/cmp.c b/cmp.c
index 980c7ff..ea8902f 100644
--- a/cmp.c
+++ b/cmp.c
@@ -27,7 +27,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc != 2 || (lflag && sflag))
usage();
diff --git a/cols.c b/cols.c
index 981b36c..6892070 100644
--- a/cols.c
+++ b/cols.c
@@ -35,7 +35,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!cflag) {
if ((p = getenv("COLUMNS")))
diff --git a/comm.c b/comm.c
index 138b5ea..4648d7d 100644
--- a/comm.c
+++ b/comm.c
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc != 2)
usage();
diff --git a/cp.c b/cp.c
index ded0122..d87e77e 100644
--- a/cp.c
+++ b/cp.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc < 2)
usage();
diff --git a/cron.c b/cron.c
index cd03b9b..4513dd7 100644
--- a/cron.c
+++ b/cron.c
@@ -426,7 +426,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc > 0)
usage();
diff --git a/cut.c b/cut.c
index 7e5927b..0258271 100644
--- a/cut.c
+++ b/cut.c
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!mode)
usage();
diff --git a/date.c b/date.c
index f6581d5..1671e1f 100644
--- a/date.c
+++ b/date.c
@@ -31,7 +31,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc) {
if (argc != 1 || argv[0][0] != '+')
diff --git a/du.c b/du.c
index 93b112e..41e4380 100644
--- a/du.c
+++ b/du.c
@@ -89,7 +89,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if ((aflag && sflag) || (dflag && sflag))
usage();
diff --git a/env.c b/env.c
index 953eec2..d58f2dd 100644
--- a/env.c
+++ b/env.c
@@ -30,7 +30,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
for (; *argv && strchr(*argv, '='); argc--, argv++)
putenv(*argv);
diff --git a/expand.c b/expand.c
index f0e6298..f534134 100644
--- a/expand.c
+++ b/expand.c
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
tablistlen = parselist(tl);
diff --git a/find.c b/find.c
index 75b9f8e..72926e1 100644
--- a/find.c
+++ b/find.c
@@ -1006,7 +1006,7 @@ main(int argc, char **argv)
case 'H': gflags.l = !(gflags.h = 1); break;
case 'L': gflags.h = !(gflags.l = 1); break;
default : usage();
- } ARGEND;
+ } ARGEND
paths = argv;
diff --git a/flock.c b/flock.c
index 292821f..863350e 100644
--- a/flock.c
+++ b/flock.c
@@ -39,7 +39,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc < 2)
usage();
diff --git a/fold.c b/fold.c
index ce59488..f220767 100644
--- a/fold.c
+++ b/fold.c
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc) {
fold(stdin, "<stdin>");
diff --git a/getconf.c b/getconf.c
index ec3b456..4f354b1 100644
--- a/getconf.c
+++ b/getconf.c
@@ -270,7 +270,7 @@ main(int argc, char *argv[])
/* ignore */
EARGF(usage());
break;
- } ARGEND;
+ } ARGEND
if (argc == 1) {
/* sysconf */
diff --git a/grep.c b/grep.c
index 6e8daef..c47e218 100644
--- a/grep.c
+++ b/grep.c
@@ -236,7 +236,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc == 0 && !eflag && !fflag)
usage(); /* no pattern */
diff --git a/head.c b/head.c
index 24cd1f9..a99b6f4 100644
--- a/head.c
+++ b/head.c
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc) {
head(stdin, "<stdin>", n);
diff --git a/join.c b/join.c
index ddccdf1..1a08927 100644
--- a/join.c
+++ b/join.c
@@ -511,7 +511,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (sep)
seplen = unescape(sep);
diff --git a/ln.c b/ln.c
index ef3997c..ab1ec4e 100644
--- a/ln.c
+++ b/ln.c
@@ -39,7 +39,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/logger.c b/logger.c
index 36e20d1..603da04 100644
--- a/logger.c
+++ b/logger.c
@@ -65,7 +65,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
openlog(tag ? tag : getlogin(), logflags, 0);
diff --git a/ls.c b/ls.c
index c942930..a19244c 100644
--- a/ls.c
+++ b/ls.c
@@ -432,7 +432,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
switch (argc) {
case 0: /* fallthrough */
diff --git a/md5sum.c b/md5sum.c
index ade4c97..86fb40f 100644
--- a/md5sum.c
+++ b/md5sum.c
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
ret |= cryptfunc(argc, argv, &md5_ops, md, sizeof(md));
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
diff --git a/mkdir.c b/mkdir.c
index 6de0d1a..f5da527 100644
--- a/mkdir.c
+++ b/mkdir.c
@@ -29,7 +29,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/mkfifo.c b/mkfifo.c
index fb04418..a09f4f5 100644
--- a/mkfifo.c
+++ b/mkfifo.c
@@ -25,7 +25,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/mktemp.c b/mktemp.c
index 68c2591..a3076ba 100644
--- a/mktemp.c
+++ b/mktemp.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc > 1)
usage();
diff --git a/mv.c b/mv.c
index fa2304e..e02bd8e 100644
--- a/mv.c
+++ b/mv.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc < 2)
usage();
diff --git a/nice.c b/nice.c
index d9985fa..3b9b9fb 100644
--- a/nice.c
+++ b/nice.c
@@ -25,7 +25,7 @@ main(int argc, char *argv[])
default:
usage();
break;
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/nl.c b/nl.c
index aa566ec..b46932a 100644
--- a/nl.c
+++ b/nl.c
@@ -183,7 +183,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc > 1)
usage();
diff --git a/od.c b/od.c
index 1debe04..67356e3 100644
--- a/od.c
+++ b/od.c
@@ -258,7 +258,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
/* line length is lcm of type lengths and >= 16 by doubling */
TAILQ_FOREACH(t, &head, entry)
diff --git a/paste.c b/paste.c
index 7f7fb81..35f7543 100644
--- a/paste.c
+++ b/paste.c
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/pwd.c b/pwd.c
index a506cea..c6a4497 100644
--- a/pwd.c
+++ b/pwd.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!getcwd(cwd, sizeof(cwd)))
eprintf("getcwd:");
diff --git a/readlink.c b/readlink.c
index a72390f..8d2a98d 100644
--- a/readlink.c
+++ b/readlink.c
@@ -35,7 +35,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc != 1)
usage();
diff --git a/renice.c b/renice.c
index 289ae8a..38853b8 100644
--- a/renice.c
+++ b/renice.c
@@ -56,7 +56,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc || !adj)
usage();
diff --git a/rm.c b/rm.c
index 9a63f8a..42bc022 100644
--- a/rm.c
+++ b/rm.c
@@ -24,7 +24,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc) {
if (!(r.flags & SILENT))
diff --git a/rmdir.c b/rmdir.c
index 912eeef..4422454 100644
--- a/rmdir.c
+++ b/rmdir.c
@@ -23,7 +23,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/sed.c b/sed.c
index 60dd37a..8480477 100644
--- a/sed.c
+++ b/sed.c
@@ -1706,7 +1706,7 @@ main(int argc, char *argv[])
script = 1;
break;
default : usage();
- } ARGEND;
+ } ARGEND
/* no script to run */
if (!script && !argc)
diff --git a/seq.c b/seq.c
index 4f2dd48..46a213b 100644
--- a/seq.c
+++ b/seq.c
@@ -98,7 +98,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
switch (argc) {
case 3:
diff --git a/sha1sum.c b/sha1sum.c
index 9743ee9..4f3ae77 100644
--- a/sha1sum.c
+++ b/sha1sum.c
@@ -32,7 +32,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
ret |= cryptfunc(argc, argv, &sha1_ops, md, sizeof(md));
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
diff --git a/sha256sum.c b/sha256sum.c
index 57fc977..d863539 100644
--- a/sha256sum.c
+++ b/sha256sum.c
@@ -32,7 +32,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
ret |= cryptfunc(argc, argv, &sha256_ops, md, sizeof(md));
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
diff --git a/sha512sum.c b/sha512sum.c
index 3b7594a..65a0c2c 100644
--- a/sha512sum.c
+++ b/sha512sum.c
@@ -32,7 +32,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
ret |= cryptfunc(argc, argv, &sha512_ops, md, sizeof(md));
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
diff --git a/sort.c b/sort.c
index e05226b..0761d0f 100644
--- a/sort.c
+++ b/sort.c
@@ -291,7 +291,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
/* -b shall only apply to custom key definitions */
if (TAILQ_EMPTY(&kdhead) && global_flags)
diff --git a/split.c b/split.c
index 939ef44..f15e925 100644
--- a/split.c
+++ b/split.c
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (*argv)
file = *argv++;
diff --git a/strings.c b/strings.c
index a3d722f..76b3316 100644
--- a/strings.c
+++ b/strings.c
@@ -74,7 +74,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc) {
strings(stdin, "<stdin>", len);
diff --git a/tail.c b/tail.c
index 417289f..09f5b58 100644
--- a/tail.c
+++ b/tail.c
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
tail(stdin, "<stdin>", n);
diff --git a/tar.c b/tar.c
index 16c3da0..1943e18 100644
--- a/tar.c
+++ b/tar.c
@@ -523,7 +523,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!mode)
usage();
diff --git a/tee.c b/tee.c
index 260b964..399824c 100644
--- a/tee.c
+++ b/tee.c
@@ -27,7 +27,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (iflag && signal(SIGINT, SIG_IGN) == SIG_ERR)
eprintf("signal:");
diff --git a/tftp.c b/tftp.c
index 4073700..d0a4fa9 100644
--- a/tftp.c
+++ b/tftp.c
@@ -269,7 +269,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!host || !argc)
usage();
diff --git a/time.c b/time.c
index fb7d572..4af0352 100644
--- a/time.c
+++ b/time.c
@@ -28,7 +28,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/touch.c b/touch.c
index fb04142..e2dc04a 100644
--- a/touch.c
+++ b/touch.c
@@ -147,7 +147,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/tr.c b/tr.c
index cc35a57..b40f0cc 100644
--- a/tr.c
+++ b/tr.c
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc || argc > 2 || (argc == 1 && dflag == sflag))
usage();
diff --git a/uname.c b/uname.c
index ede818e..dfc979e 100644
--- a/uname.c
+++ b/uname.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (uname(&u) < 0)
eprintf("uname:");
diff --git a/unexpand.c b/unexpand.c
index 56aa5e2..1818691 100644
--- a/unexpand.c
+++ b/unexpand.c
@@ -146,7 +146,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
tablistlen = parselist(tl);
diff --git a/uniq.c b/uniq.c
index 0476d34..965f79e 100644
--- a/uniq.c
+++ b/uniq.c
@@ -118,7 +118,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc > 2)
usage();
diff --git a/uudecode.c b/uudecode.c
index 41636ce..b53570c 100644
--- a/uudecode.c
+++ b/uudecode.c
@@ -242,7 +242,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (argc > 1)
usage();
diff --git a/uuencode.c b/uuencode.c
index c560f92..8b2f8df 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -110,7 +110,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc || argc > 2)
usage();
diff --git a/wc.c b/wc.c
index 6b8631a..d6d43de 100644
--- a/wc.c
+++ b/wc.c
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc) {
wc(stdin, NULL);
diff --git a/which.c b/which.c
index 22c31e5..352cdfa 100644
--- a/which.c
+++ b/which.c
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
if (!argc)
usage();
diff --git a/xargs.c b/xargs.c
index 34c82be..242106b 100644
--- a/xargs.c
+++ b/xargs.c
@@ -226,7 +226,7 @@ main(int argc, char *argv[])
break;
default:
usage();
- } ARGEND;
+ } ARGEND
do {
argsz = 0; i = 0; a = 0;
