 @@ -1,14 +1,14 @@
-/* $NetBSD: ttyflags.c,v 1.17 2008/07/20 01:20:23 lukem Exp $ */
+/* $NetBSD: ttyflags.c,v 1.18 2011/08/27 18:58:51 joerg Exp $ */
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -31,49 +31,49 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1994\
  Christopher G. Demetriou.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
-__RCSID("$NetBSD: ttyflags.c,v 1.17 2008/07/20 01:20:23 lukem Exp $");
+__RCSID("$NetBSD: ttyflags.c,v 1.18 2011/08/27 18:58:51 joerg Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ttyent.h>
 #include <unistd.h>
-int change_all(void);
+static int change_all(void);
-int change_ttyflags(struct ttyent *);
+static int change_ttyflags(struct ttyent *);
-int change_ttys(char **);
+static int change_ttys(char **);
-void usage(void);
+__dead static void usage(void);
-int nflag, vflag;
+static int nflag, vflag;
 /*
  * Ttyflags sets the device-specific tty flags, based on the contents
  * of /etc/ttys.  It can either set all of the ttys' flags, or set
  * the flags of the ttys specified on the command line.
  */
 int
 main(int argc, char *argv[])
+{
 	int aflag, ch, rval;
 	aflag = nflag = vflag = 0;
 	while ((ch = getopt(argc, argv, "anv")) != -1)
 @@ -106,70 +106,70 @@ main(int argc, char *argv[])
 		rval = change_all();
 	else
 		rval = change_ttys(argv);
 	if (endttyent() == 0)
 		warn("endttyent");
 	exit(rval);
+}
 /*
  * Change all /etc/ttys entries' flags.
  */
-int
+static int
 change_all(void)
+{
 	struct ttyent *tep;
 	int rval;
 	rval = 0;
 	for (tep = getttyent(); tep != NULL; tep = getttyent())
 		if (change_ttyflags(tep))
 			rval = 1;
 	return (rval);
+}
 /*
  * Change the specified ttys' flags.
  */
-int
+static int
 change_ttys(char **ttylist)
+{
 	struct ttyent *tep;
 	int rval;
 	rval = 0;
 	for (; *ttylist != NULL; ttylist++) {
 		tep = getttynam(*ttylist);
 		if (tep == NULL) {
 			warnx("couldn't find an entry in %s for \"%s\"",
 			    _PATH_TTYS, *ttylist);
 			rval = 1;
 			continue;
+		}
 		if (change_ttyflags(tep))
 			rval = 1;
+	}
 	return (rval);
+}
 /*
  * Actually do the work; find out what the new flags value should be,
  * open the device, and change the flags.
  */
-int
+static int
 change_ttyflags(struct ttyent *tep)
+{
 	int fd, flags, rval, st, sep;
 	char path[PATH_MAX];
 	char strflags[256];
 	st = tep->ty_status;
 	sep = flags = rval = 0;
 	strflags[0] = '\0';
 	/* Convert ttyent.h flags into ioctl flags. */
 	if (st & TTY_LOCAL) {
 @@ -227,19 +227,19 @@ change_ttyflags(struct ttyent *tep)
 			warn("TIOCSFLAGS on %s", path);
 			rval = (errno != ENOTTY);
+		}
 	if (close(fd) == -1) {
 		warn("close %s", path);
 		return (1);
+	}
 	return (rval);
+}
 /*
  * Print usage information when a bogus set of arguments is given.
  */
-void
+static void
 usage(void)
+{
 	(void)fprintf(stderr, "usage: ttyflags [-v] [-a | tty ... ]\n");
 	exit(1);
+}