 @@ -1,14 +1,14 @@
-/*	$NetBSD: rndctl.c,v 1.19 2009/04/05 12:06:33 lukem Exp $	*/
+/*	$NetBSD: rndctl.c,v 1.20 2011/08/27 18:48:59 joerg Exp $	*/
 /*-
  * Copyright (c) 1997 Michael Graff.
  * 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.
 @@ -21,152 +21,152 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.19 2009/04/05 12:06:33 lukem Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.20 2011/08/27 18:48:59 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/rnd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <err.h>
 #include <string.h>
 typedef struct {
 	const char *a_name;
 	u_int32_t a_type;
 } arg_t;
-arg_t source_types[] = {
+static const arg_t source_types[] = {
 	{ "???",     RND_TYPE_UNKNOWN },
 	{ "disk",    RND_TYPE_DISK },
 	{ "net",     RND_TYPE_NET },
 	{ "tape",    RND_TYPE_TAPE },
 	{ "tty",     RND_TYPE_TTY },
 	{ "rng",     RND_TYPE_RNG },
 	{ NULL,      0 }
 };
-static void usage(void);
+__dead static void usage(void);
-u_int32_t find_type(char *name);
+static u_int32_t find_type(const char *name);
-const char *find_name(u_int32_t);
+static const char *find_name(u_int32_t);
-void do_ioctl(rndctl_t *);
+static void do_ioctl(rndctl_t *);
-char * strflags(u_int32_t);
+static char * strflags(u_int32_t);
-void do_list(int, u_int32_t, char *);
+static void do_list(int, u_int32_t, char *);
-void do_stats(void);
+static void do_stats(void);
 static void
 usage(void)
+{
 	fprintf(stderr, "usage: %s -CEce [-d devname | -t devtype]\n",
 	    getprogname());
 	fprintf(stderr, "       %s -ls [-d devname | -t devtype]\n",
 	    getprogname());
 	exit(1);
+}
-u_int32_t
+static u_int32_t
-find_type(char *name)
+find_type(const char *name)
+{
-	arg_t *a;
+	const arg_t *a;
 	a = source_types;
 	while (a->a_name != NULL) {
 		if (strcmp(a->a_name, name) == 0)
 			return (a->a_type);
 		a++;
+	}
 	errx(1, "device name %s unknown", name);
 	return (0);
+}
-const char *
+static const char *
 find_name(u_int32_t type)
+{
-	arg_t *a;
+	const arg_t *a;
 	a = source_types;
 	while (a->a_name != NULL) {
 		if (type == a->a_type)
 			return (a->a_name);
 		a++;
+	}
 	warnx("device type %u unknown", type);
 	return ("???");
+}
-void
+static void
 do_ioctl(rndctl_t *rctl)
+{
 	int fd;
 	int res;
 	fd = open("/dev/urandom", O_RDONLY, 0644);
 	if (fd < 0)
 		err(1, "open");
 	res = ioctl(fd, RNDCTL, rctl);
 	if (res < 0)
 		err(1, "ioctl(RNDCTL)");
 	close(fd);
+}
-char *
+static char *
 strflags(u_int32_t fl)
+{
 	static char str[512];
 	str[0] = 0;
 	if (fl & RND_FLAG_NO_ESTIMATE)
+		;
 	else
 		strlcat(str, "estimate", sizeof(str));
 	if (fl & RND_FLAG_NO_COLLECT)
+		;
 	else {
 		if (str[0])
 			strlcat(str, ", ", sizeof(str));
 		strlcat(str, "collect", sizeof(str));
+	}
 	return (str);
+}
 #define HEADER "Source                 Bits Type      Flags\n"
-void
+static void
 do_list(int all, u_int32_t type, char *name)
+{
 	rndstat_t rstat;
 	rndstat_name_t rstat_name;
 	int fd;
 	int res;
 	uint32_t i;
 	u_int32_t start;
 	fd = open("/dev/urandom", O_RDONLY, 0644);
 	if (fd < 0)
 		err(1, "open");
 @@ -206,28 +206,28 @@ do_list(int all, u_int32_t type, char *n
 			    type == rstat.source[i].type)
 				printf("%-16s %10u %-4s %s\n",
 				    rstat.source[i].name,
 				    rstat.source[i].total,
 				    find_name(rstat.source[i].type),
 				    strflags(rstat.source[i].flags));
+		}
 		start += rstat.count;
+	}
 	close(fd);
+}
-void
+static void
-do_stats()
+do_stats(void)
+{
 	rndpoolstat_t rs;
 	int fd;
 	fd = open("/dev/urandom", O_RDONLY, 0644);
 	if (fd < 0)
 		err(1, "open");
 	if (ioctl(fd, RNDGETPOOLSTAT, &rs) < 0)
 		err(1, "ioctl(RNDGETPOOLSTAT)");
 	printf("\t%9u bits mixed into pool\n", rs.added);
 	printf("\t%9u bits currently stored in pool (max %u)\n",