style(9) fixes, optional flags without arguments come first;

while here, some spacing fixes

ok deanna@, jakemsr@

6 files changed, 34 insertions, 34 deletions

diff --git a/usr.bin/audioctl/audioctl.1 b/usr.bin/audioctl/audioctl.1
index e96590f7f6b..ab9ca686fe6 100644
--- a/usr.bin/audioctl/audioctl.1
+++ b/usr.bin/audioctl/audioctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: audioctl.1,v 1.21 2007/08/06 19:16:06 sobrado Exp $
+.\" $OpenBSD: audioctl.1,v 1.22 2007/09/27 21:55:54 sobrado Exp $
 .\" $NetBSD: audioctl.1,v 1.7 1998/04/27 16:55:23 augustss Exp $
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 6 2007 $
+.Dd $Mdocdate: September 27 2007 $
 .Dt AUDIOCTL 1
 .Os
 .Sh NAME
@@ -41,16 +41,16 @@
 .Nd control audio device
 .Sh SYNOPSIS
 .Nm audioctl
-.Op Fl f Ar file
 .Op Fl n
+.Op Fl f Ar file
 .Fl a
 .Nm audioctl
-.Op Fl f Ar file
 .Op Fl n
+.Op Fl f Ar file
 .Ar name ...
 .Nm audioctl
-.Op Fl f Ar file
 .Op Fl n
+.Op Fl f Ar file
 .Ar name Ns = Ns Ar value ...
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/audioctl/audioctl.c b/usr.bin/audioctl/audioctl.c
index 80fcc5fbd2f..e1cdee04cb9 100644
--- a/usr.bin/audioctl/audioctl.c
+++ b/usr.bin/audioctl/audioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audioctl.c,v 1.14 2007/09/17 13:46:11 jakemsr Exp $	*/
+/*	$OpenBSD: audioctl.c,v 1.15 2007/09/27 21:55:54 sobrado Exp $	*/
 /*	$NetBSD: audioctl.c,v 1.14 1998/04/27 16:55:23 augustss Exp $	*/
 
 /*
@@ -180,7 +180,7 @@ struct field *
 findfield(char *name)
 {
 	int i;
-	for(i = 0; fields[i].name; i++)
+	for (i = 0; fields[i].name; i++)
 		if (strcmp(fields[i].name, name) == 0)
 			return &fields[i];
 	return (0);
@@ -195,7 +195,7 @@ prfield(struct field *p, const char *sep)
 
 	if (sep)
 		fprintf(out, "%s%s", p->name, sep);
-	switch(p->format) {
+	switch (p->format) {
 	case STRING:
 		fprintf(out, "%s", (char*)p->valp);
 		break;
@@ -229,7 +229,7 @@ prfield(struct field *p, const char *sep)
 		break;
 	case ENC:
 		v = *(u_int*)p->valp;
-		for(i = 0; encs[i].ename; i++)
+		for (i = 0; encs[i].ename; i++)
 			if (encs[i].eno == v)
 				break;
 		if (encs[i].ename)
@@ -257,7 +257,7 @@ rdfield(struct field *p, char *q)
 	int i;
 	u_int u;
 
-	switch(p->format) {
+	switch (p->format) {
 	case UINT:
 		if (sscanf(q, "%u", (unsigned int *)p->valp) != 1)
 			warnx("Bad number %s", q);
@@ -274,7 +274,7 @@ rdfield(struct field *p, char *q)
 			warnx("Bad number %s", q);
 		break;
 	case ENC:
-		for(i = 0; encs[i].ename; i++)
+		for (i = 0; encs[i].ename; i++)
 			if (strcmp(encs[i].ename, q) == 0)
 				break;
 		if (encs[i].ename)
@@ -295,7 +295,7 @@ getinfo(int fd)
 
 	if (ioctl(fd, AUDIO_GETDEV, &adev) < 0)
 		err(1, "AUDIO_GETDEV");
-	for(;;) {
+	for (;;) {
 		audio_encoding_t enc;
 		enc.index = i++;
 		if (ioctl(fd, AUDIO_GETENC, &enc) < 0)
@@ -323,10 +323,10 @@ usage(void)
 	extern char *__progname;		/* from crt0.o */
 
 	fprintf(stderr,
-	    "usage: %s [-f file] [-n] -a\n"
-	    "       %s [-f file] [-n] name ...\n"
-	    "       %s [-f file] [-n] name=value ...\n", __progname,
-		__progname, __progname);
+	    "usage: %s [-n] [-f file] -a\n"
+	    "       %s [-n] [-f file] name ...\n"
+	    "       %s [-n] [-f file] name=value ...\n",
+	    __progname, __progname, __progname);
 
 	exit(1);
 }
@@ -345,7 +345,7 @@ main(int argc, char **argv)
 		file = "/dev/audioctl";
     
 	while ((ch = getopt(argc, argv, "af:nw")) != -1) {
-		switch(ch) {
+		switch (ch) {
 		case 'a':
 			aflag++;
 			break;
diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1
index 4a5e0cc1e8b..2957e859046 100644
--- a/usr.bin/mixerctl/mixerctl.1
+++ b/usr.bin/mixerctl/mixerctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mixerctl.1,v 1.28 2007/08/06 19:16:06 sobrado Exp $
+.\" $OpenBSD: mixerctl.1,v 1.29 2007/09/27 21:55:54 sobrado Exp $
 .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 6 2007 $
+.Dd $Mdocdate: September 27 2007 $
 .Dt MIXERCTL 1
 .Os
 .Sh NAME
@@ -55,7 +55,7 @@
 .Ar name ...
 .Nm mixerctl
 .Op Fl q
-.Pf \ \& Op Fl f Ar file
+.Op Fl f Ar file
 .Xo
 .Ar name Ns = Ns Ar value ...
 .Xc
diff --git a/usr.bin/mixerctl/mixerctl.c b/usr.bin/mixerctl/mixerctl.c
index cdf7b762d7b..887105bc60d 100644
--- a/usr.bin/mixerctl/mixerctl.c
+++ b/usr.bin/mixerctl/mixerctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mixerctl.c,v 1.24 2007/08/06 19:16:06 sobrado Exp $	*/
+/*	$OpenBSD: mixerctl.c,v 1.25 2007/09/27 21:55:54 sobrado Exp $	*/
 /*	$NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $	*/
 
 /*
@@ -260,7 +260,7 @@ main(int argc, char **argv)
 		file = "/dev/mixer";
 
 	while ((ch = getopt(argc, argv, "af:nqtvw")) != -1) {
-		switch(ch) {
+		switch (ch) {
 		case 'a':
 			aflag++;
 			break;
@@ -403,7 +403,7 @@ usage(void)
 	    "usage: %s [-nv] [-f file] -a\n"
 	    "       %s [-nv] [-f file] name ...\n"
 	    "       %s [-qt] [-f file] name ...\n"
-	    "       %s [-q]  [-f file] name=value ...\n",
+	    "       %s [-q] [-f file] name=value ...\n",
 	    __progname, __progname, __progname, __progname);
 
 	exit(1);
diff --git a/usr.bin/radioctl/radioctl.1 b/usr.bin/radioctl/radioctl.1
index 7fe8a68e05b..306b3a6c40f 100644
--- a/usr.bin/radioctl/radioctl.1
+++ b/usr.bin/radioctl/radioctl.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: radioctl.1,v 1.12 2007/05/31 19:20:14 jmc Exp $
+.\"	$OpenBSD: radioctl.1,v 1.13 2007/09/27 21:55:54 sobrado Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 27 2007 $
 .Dt RADIOCTL 1
 .Os
 .Sh NAME
@@ -31,16 +31,16 @@
 .Nd control radio tuners
 .Sh SYNOPSIS
 .Nm radioctl
-.Op Fl f Ar file
 .Op Fl nv
+.Op Fl f Ar file
 .Fl a
 .Nm radioctl
-.Op Fl f Ar file
 .Op Fl nv
+.Op Fl f Ar file
 .Ar name
 .Nm radioctl
-.Op Fl f Ar file
 .Op Fl n
+.Op Fl f Ar file
 .Ar name Ns Li = Ns Ar value
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/radioctl/radioctl.c b/usr.bin/radioctl/radioctl.c
index 41f6e94af34..e611e4ecf85 100644
--- a/usr.bin/radioctl/radioctl.c
+++ b/usr.bin/radioctl/radioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radioctl.c,v 1.13 2006/02/05 23:52:58 jakemsr Exp $ */
+/* $OpenBSD: radioctl.c,v 1.14 2007/09/27 21:55:54 sobrado Exp $ */
 /* $RuOBSD: radioctl.c,v 1.4 2001/10/20 18:09:10 pva Exp $ */
 
 /*
@@ -192,11 +192,11 @@ main(int argc, char **argv)
 		print_vars(silent, show_choices);
 	else if (argc > 0 && !show_vars) {
 		if (mode == O_RDWR) {
-			for(; argc--; argv++)
+			for (; argc--; argv++)
 				if (parse_opt(*argv, &opt))
 					do_ioctls(rd, &opt, silent);
 		} else {
-			for(; argc--; argv++)
+			for (; argc--; argv++)
 				if (parse_opt(*argv, &opt)) {
 					show_verbose(varname[opt.option],
 					    silent);
@@ -217,9 +217,9 @@ void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: %s [-f file] [-nv] variable ...\n"
-	    "       %s [-f file] [-n] variable=value ...\n"
-	    "       %s [-f file] [-nv] -a\n",
+	    "usage: %s [-nv] [-f file] -a\n"
+	    "       %s [-nv] [-f file] name\n"
+	    "       %s [-n] [-f file] name=value\n",
 	    __progname, __progname, __progname);
 	exit(1);
 }