From a4c90f86377b0d991fbdd87f9360bed1faea6fef Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Mon, 5 Dec 2005 01:04:01 +0000
Subject: [PATCH] - Ansify function definitions.

- Move function type on a line of its own.

- Remove __P().

- Minor style cleanup.

- Remove (void) casts for unused return values.
---
 usr.sbin/acpi/acpiconf/acpiconf.c |  4 +-
 usr.sbin/ancontrol/ancontrol.c    | 86 +++++++++++++++++++-----------
 usr.sbin/apmd/contrib/pccardq.c   |  6 +--
 usr.sbin/clog/clog.c              | 24 ++++++---
 usr.sbin/dntpd/system.c           |  4 +-
 usr.sbin/ipwcontrol/ipwcontrol.c  | 26 ++++-----
 usr.sbin/iwicontrol/iwicontrol.c  | 24 ++++-----
 usr.sbin/keyadmin/keyadmin.c      | 87 ++++++++++++-------------------
 usr.sbin/keyserv/crypt_server.c   | 18 ++++---
 9 files changed, 149 insertions(+), 130 deletions(-)

diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 1cb19e7b88..65399110ef 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -25,7 +25,7 @@
  *
  *	$Id: acpiconf.c,v 1.5 2000/08/08 14:12:19 iwasaki Exp $
  *	$FreeBSD: src/usr.sbin/acpi/acpiconf/acpiconf.c,v 1.14 2004/03/05 02:48:22 takawata Exp $
- *	$DragonFly: src/usr.sbin/acpi/acpiconf/acpiconf.c,v 1.1 2004/07/05 00:22:43 dillon Exp $
+ *	$DragonFly: src/usr.sbin/acpi/acpiconf/acpiconf.c,v 1.2 2005/12/05 01:04:00 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,7 @@
 static int	acpifd;
 
 static int
-acpi_init()
+acpi_init(void)
 {
 	acpifd = open(ACPIDEV, O_RDWR);
 	if (acpifd == -1){
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 3ebc323b74..97ab3c3a67 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.9 2003/02/01 03:25:13 ambrisko Exp $
- * $DragonFly: src/usr.sbin/ancontrol/ancontrol.c,v 1.5 2003/11/15 20:33:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/ancontrol/ancontrol.c,v 1.6 2005/12/05 01:04:00 swildner Exp $
  *
  * @(#) Copyright (c) 1997, 1998, 1999 Bill Paul. All rights reserved.
  * @(#) $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.9 2003/02/01 03:25:13 ambrisko Exp
@@ -134,7 +134,8 @@ int main		(int, char **);
 
 #define ACT_DUMPRSSIMAP 39
 
-static int an_getval(const char *iface, struct an_req *areq)
+static int
+an_getval(const char *iface, struct an_req *areq)
 {
 	struct ifreq		ifr;
 	int			s, okay = 1;
@@ -159,7 +160,8 @@ static int an_getval(const char *iface, struct an_req *areq)
 	return okay;
 }
 
-static void an_setval(const char *iface, struct an_req *areq)
+static void
+an_setval(const char *iface, struct an_req *areq)
 {
 	struct ifreq		ifr;
 	int			s;
@@ -182,7 +184,8 @@ static void an_setval(const char *iface, struct an_req *areq)
 	return;
 }
 
-static void an_printstr(char *str, int len)
+static void
+an_printstr(char *str, int len)
 {
 	int			i;
 
@@ -196,7 +199,8 @@ static void an_printstr(char *str, int len)
 	return;
 }
 
-static void an_printwords(u_int16_t *w, int len)
+static void
+an_printwords(u_int16_t *w, int len)
 {
 	int			i;
 
@@ -208,7 +212,8 @@ static void an_printwords(u_int16_t *w, int len)
 	return;
 }
 
-static void an_printspeeds(u_int8_t *w, int len)
+static void
+an_printspeeds(u_int8_t *w, int len)
 {
 	int			i;
 
@@ -220,7 +225,8 @@ static void an_printspeeds(u_int8_t *w, int len)
 	return;
 }
 
-static void an_printbool(int val)
+static void
+an_printbool(int val)
 {
 	if (val)
 		printf("[ On ]");
@@ -230,7 +236,8 @@ static void an_printbool(int val)
 	return;
 }
 
-static void an_printhex(char *ptr, int len)
+static void
+an_printhex(char *ptr, int len)
 {
 	int			i;
 
@@ -245,7 +252,8 @@ static void an_printhex(char *ptr, int len)
 	return;
 }
 
-static void an_dumpstatus(const char *iface)
+static void
+an_dumpstatus(const char *iface)
 {
 	struct an_ltv_status	*sts;
 	struct an_req		areq;
@@ -349,7 +357,8 @@ static void an_dumpstatus(const char *iface)
 	return;
 }
 
-static void an_dumpcaps(const char *iface)
+static void
+an_dumpcaps(const char *iface)
 {
 	struct an_ltv_caps	*caps;
 	struct an_req		areq;
@@ -433,7 +442,8 @@ static void an_dumpcaps(const char *iface)
 	return;
 }
 
-static void an_dumpstats(const char *iface)
+static void
+an_dumpstats(const char *iface)
 {
 	struct an_ltv_stats	*stats;
 	struct an_req		areq;
@@ -599,7 +609,8 @@ static void an_dumpstats(const char *iface)
 	return;
 }
 
-static void an_dumpap(const char *iface)
+static void
+an_dumpap(const char *iface)
 {
 	struct an_ltv_aplist	*ap;
 	struct an_req		areq;
@@ -623,7 +634,8 @@ static void an_dumpap(const char *iface)
 	return;
 }
 
-static void an_dumpssid(const char *iface)
+static void
+an_dumpssid(const char *iface)
 {
 	struct an_ltv_ssidlist	*ssid;
 	struct an_req		areq;
@@ -641,7 +653,8 @@ static void an_dumpssid(const char *iface)
 	return;
 }
 
-static void an_dumpconfig(const char *iface)
+static void
+an_dumpconfig(const char *iface)
 {
 	struct an_ltv_genconfig	*cfg;
 	struct an_req		areq;
@@ -847,7 +860,8 @@ static void an_dumpconfig(const char *iface)
 	return;
 }
 
-static void an_dumprssimap(const char *iface)
+static void
+an_dumprssimap(const char *iface)
 {
 	struct an_ltv_rssi_map	*rssi;
 	struct an_req		areq;
@@ -875,7 +889,8 @@ static void an_dumprssimap(const char *iface)
 	return;
 }
 
-static void usage(char *p)
+static void
+usage(char *p)
 {
 	fprintf(stderr, "usage:  %s -i iface -A (show specified APs)\n", p);
 	fprintf(stderr, "\t%s -i iface -N (show specified SSIDss)\n", p);
@@ -915,7 +930,8 @@ static void usage(char *p)
 	exit(1);
 }
 
-static void an_setconfig(const char *iface, int act, void *arg)
+static void
+an_setconfig(const char *iface, int act, void *arg)
 {
 	struct an_ltv_genconfig	*cfg;
 	struct an_ltv_caps	*caps;
@@ -1054,7 +1070,8 @@ static void an_setconfig(const char *iface, int act, void *arg)
 	exit(0);
 }
 
-static void an_setspeed(const char *iface, int act __unused, void *arg)
+static void
+an_setspeed(const char *iface, int act __unused, void *arg)
 {
 	struct an_req		areq;
 	struct an_ltv_caps	*caps;
@@ -1099,7 +1116,8 @@ static void an_setspeed(const char *iface, int act __unused, void *arg)
 	exit(0);
 }
 
-static void an_setap(const char *iface, int act, void *arg)
+static void
+an_setap(const char *iface, int act, void *arg)
 {
 	struct an_ltv_aplist	*ap;
 	struct an_req		areq;
@@ -1142,7 +1160,8 @@ static void an_setap(const char *iface, int act, void *arg)
 	exit(0);
 }
 
-static void an_setssid(const char *iface, int act, void *arg)
+static void
+an_setssid(const char *iface, int act, void *arg)
 {
 	struct an_ltv_ssidlist	*ssid;
 	struct an_req		areq;
@@ -1179,7 +1198,8 @@ static void an_setssid(const char *iface, int act, void *arg)
 }
 
 #ifdef ANCACHE
-static void an_zerocache(const char *iface)
+static void
+an_zerocache(const char *iface)
 {
 	struct an_req		areq;
 
@@ -1192,7 +1212,8 @@ static void an_zerocache(const char *iface)
 	return;
 }
 
-static void an_readcache(const char *iface)
+static void
+an_readcache(const char *iface)
 {
 	struct an_req		areq;
 	int 			*an_sigitems;
@@ -1238,7 +1259,8 @@ static void an_readcache(const char *iface)
 }
 #endif
 
-static int an_hex2int(char c)
+static int
+an_hex2int(char c)
 {
 	if (c >= '0' && c <= '9')
 		return (c - '0');
@@ -1250,7 +1272,8 @@ static int an_hex2int(char c)
 	return (0); 
 }
 
-static void an_str2key(char *s, struct an_ltv_key *k)
+static void
+an_str2key(char *s, struct an_ltv_key *k)
 {
 	int			n, i;
 	char			*p;
@@ -1276,7 +1299,8 @@ static void an_str2key(char *s, struct an_ltv_key *k)
 	return;
 }
 
-static void an_setkeys(const char *iface, char *key, int keytype)
+static void
+an_setkeys(const char *iface, char *key, int keytype)
 {
 	struct an_req		areq;
 	struct an_ltv_key	*k;
@@ -1321,7 +1345,8 @@ static void an_setkeys(const char *iface, char *key, int keytype)
 	return;
 }
 
-static void an_readkeyinfo(const char *iface)
+static void
+an_readkeyinfo(const char *iface)
 {
 	struct an_req		areq;
 	struct an_ltv_genconfig	*cfg;
@@ -1373,7 +1398,8 @@ static void an_readkeyinfo(const char *iface)
 	return;
 }
 
-static void an_enable_tx_key(const char *iface, char *arg)
+static void
+an_enable_tx_key(const char *iface, char *arg)
 {
 	struct an_req		areq;
 	struct an_ltv_key	*k;
@@ -1416,7 +1442,8 @@ static void an_enable_tx_key(const char *iface, char *arg)
 	return;
 }
 
-static void an_enable_leap_mode(const char *iface, char *username)
+static void
+an_enable_leap_mode(const char *iface, char *username)
 {
 	struct an_req		areq;
 	struct an_ltv_status	*sts;
@@ -1510,7 +1537,8 @@ static void an_enable_leap_mode(const char *iface, char *username)
 	}
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			ch;
 	int			act = 0;
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index ea70fb32f2..1d72a58e14 100644
--- a/usr.sbin/apmd/contrib/pccardq.c
+++ b/usr.sbin/apmd/contrib/pccardq.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.2 1999/08/28 05:11:25 peter Exp $ */
-/* $DragonFly: src/usr.sbin/apmd/contrib/pccardq.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ */
+/* $DragonFly: src/usr.sbin/apmd/contrib/pccardq.c,v 1.3 2005/12/05 01:04:00 swildner Exp $ */
 
 #include <err.h>
 #include <errno.h>
@@ -21,7 +21,7 @@ const char     *tmp_dir = "/tmp";
 unsigned        slot_map = ~0;
 
 void
-usage()
+usage(void)
 {
     fprintf(stderr, "usage: %s [-a] [-n] [-s slot]\n", prog);
 }
@@ -211,7 +211,7 @@ get_slot_info(int so, int slot, char **manuf, char **version, char
     return rc;
 }
 
-const char     *
+const char *
 strstate(int state)
 {
     switch (state) {
diff --git a/usr.sbin/clog/clog.c b/usr.sbin/clog/clog.c
index 8c9612eedf..ae38aee6a6 100644
--- a/usr.sbin/clog/clog.c
+++ b/usr.sbin/clog/clog.c
@@ -25,7 +25,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $Id: clog.c,v 1.3 2001/10/02 18:51:26 jdw Exp $
- * $DragonFly: src/usr.sbin/clog/clog.c,v 1.2 2004/12/18 22:48:03 swildner Exp $
+ * $DragonFly: src/usr.sbin/clog/clog.c,v 1.3 2005/12/05 01:04:00 swildner Exp $
  */
 
 
@@ -57,13 +57,15 @@
  */
 #define BUFFER_SIZE 16384
 
-void init_log __P((const char *lname, size_t size));
-void read_log __P((const char *lname, int optf));
-void usage __P((void));
+void init_log(const char *lname, size_t size);
+void read_log(const char *lname, int optf);
+void usage(void);
 
 const char *pname;
 
-int main(int argc, char **argv) {
+int
+main(int argc, char **argv)
+{
 	int ch;
 	int init = 0;
 	int size = 0;
@@ -109,13 +111,17 @@ int main(int argc, char **argv) {
 }
 
 
-void usage() {
+void
+usage(void)
+{
   fprintf(stderr,"usage: %s [-i -s log_size] [ -f ] log_file\n",pname);
   exit(1);
 }
 
 
-void read_log(const char *lname, int optf) {
+void
+read_log(const char *lname, int optf)
+{
 	int fd;
 	struct stat sb;
 	struct clog_footer *pcf;
@@ -176,7 +182,9 @@ void read_log(const char *lname, int optf) {
 }
 
 
-void init_log(const char *lname, size_t size) {
+void
+init_log(const char *lname, size_t size)
+{
 	int fd;
 	size_t fill = size;
 	char buffer[BUFFER_SIZE];
diff --git a/usr.sbin/dntpd/system.c b/usr.sbin/dntpd/system.c
index 006c3e3471..e2de781e92 100644
--- a/usr.sbin/dntpd/system.c
+++ b/usr.sbin/dntpd/system.c
@@ -31,7 +31,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/usr.sbin/dntpd/system.c,v 1.7 2005/09/13 18:13:11 dillon Exp $
+ * $DragonFly: src/usr.sbin/dntpd/system.c,v 1.8 2005/12/05 01:04:01 swildner Exp $
  */
 
 #include "defs.h"
@@ -49,7 +49,7 @@
  * intact.
  */
 void
-sysntp_clear_alternative_corrections()
+sysntp_clear_alternative_corrections(void)
 {
     struct timex ntp;
     int64_t offset;
diff --git a/usr.sbin/ipwcontrol/ipwcontrol.c b/usr.sbin/ipwcontrol/ipwcontrol.c
index f8623ff3dc..b0474ba560 100644
--- a/usr.sbin/ipwcontrol/ipwcontrol.c
+++ b/usr.sbin/ipwcontrol/ipwcontrol.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ipwcontrol.c,v 1.5.2.1 2005/01/13 20:01:05 damien Exp $
- * $DragonFly: src/usr.sbin/ipwcontrol/Attic/ipwcontrol.c,v 1.2 2005/07/08 13:17:33 joerg Exp $
+ * $DragonFly: src/usr.sbin/ipwcontrol/Attic/ipwcontrol.c,v 1.3 2005/12/05 01:04:01 swildner Exp $
  */
 
 #include <sys/cdefs.h>
@@ -128,12 +128,12 @@ do_req(const char *iface, unsigned long req, void *data)
 	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
 		err(EX_OSERR, "Can't create socket");
 
-	(void)memset(&ifr, 0, sizeof(ifr));
-	(void)strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
 	ifr.ifr_data = data;
 	error = ioctl(s, req, &ifr);
 
-	(void)close(s);
+	close(s);
 
 	return error;
 }
@@ -157,8 +157,8 @@ load_firmware(const char *iface, const char *firmware)
 	if (do_req(iface, SIOCSLOADFW, map) == -1)
 		err(EX_OSERR, "Can't load %s to driver", firmware);
 
-	(void)munmap(map, st.st_size);
-	(void)close(fd);
+	munmap(map, st.st_size);
+	close(fd);
 }
 
 static void
@@ -182,7 +182,7 @@ get_radio_state(const char *iface)
 	if (sysctlbyname(sysctl_name, &radio, &len, NULL, 0) == -1)
 		err(EX_OSERR, "Could not get radio transmitter state");
 
-	(void)printf("Radio is %s\n", radio ? "ON" : "OFF");
+	printf("Radio is %s\n", radio ? "ON" : "OFF");
 }
 
 struct statistic {
@@ -390,24 +390,24 @@ get_statistics(const char *iface)
 		err(EX_OSERR, "Can't retrieve statistics");
 
 	for (st = tbl; st->index != 0; st++) {
-		(void)printf("%-60s[", st->desc);
+		printf("%-60s[", st->desc);
 		switch (st->unit) {
 		case INT:
-			(void)printf("%u", stats[st->index]);
+			printf("%u", stats[st->index]);
 			break;
 		
 		case BOOL:
-			(void)printf(stats[st->index] ? "true" : "false");
+			printf(stats[st->index] ? "true" : "false");
 			break;
 
 		case PERCENTAGE:
-			(void)printf("%u%%", stats[st->index]);
+			printf("%u%%", stats[st->index]);
 			break;
 
 		case HEX:
 		default:
-			(void)printf("0x%08X", stats[st->index]);
+			printf("0x%08X", stats[st->index]);
 		}
-		(void)printf("]\n");
+		printf("]\n");
 	}
 }
diff --git a/usr.sbin/iwicontrol/iwicontrol.c b/usr.sbin/iwicontrol/iwicontrol.c
index 78fae47947..d7ee3f02b9 100644
--- a/usr.sbin/iwicontrol/iwicontrol.c
+++ b/usr.sbin/iwicontrol/iwicontrol.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/usr.sbin/iwicontrol/iwicontrol.c,v 1.1 2005/03/06 05:02:03 dillon Exp $
+ * $DragonFly: src/usr.sbin/iwicontrol/iwicontrol.c,v 1.2 2005/12/05 01:04:01 swildner Exp $
  */
 
 #include <sys/cdefs.h>
@@ -153,7 +153,7 @@ extern char *__progname;
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage:  %s iface\n"
+	fprintf(stderr, "usage:  %s iface\n"
 	    "\t%s iface -d path [-m bss|ibss]\n"
 	    "\t%s iface -k\n"
 	    "\t%s iface -r\n", __progname, __progname, __progname,
@@ -172,12 +172,12 @@ do_req(const char *iface, unsigned long req, void *data)
 	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
 		err(EX_OSERR, "Can't create socket");
 
-	(void)memset(&ifr, 0, sizeof ifr);
-	(void)strncpy(ifr.ifr_name, iface, sizeof ifr.ifr_name);
+	memset(&ifr, 0, sizeof ifr);
+	strncpy(ifr.ifr_name, iface, sizeof ifr.ifr_name);
 	ifr.ifr_data = data;
 	error = ioctl(s, req, &ifr);
 
-	(void)close(s);
+	close(s);
 
 	return error;
 }
@@ -202,7 +202,7 @@ mmap_file(const char *filename, char **addr, size_t *len)
 	*addr += sizeof (struct header);
 	*len -= sizeof (struct header);
 
-	(void)close(fd);
+	close(fd);
 }
 
 static void
@@ -211,14 +211,14 @@ load_firmware(const char *iface, const char *path, const char *mode)
 	char filename[FILENAME_MAX];
 	struct firmware fw;
 
-	(void)snprintf(filename, sizeof filename, "%s/iwi-boot.fw", path);
+	snprintf(filename, sizeof filename, "%s/iwi-boot.fw", path);
 	mmap_file(filename, &fw.boot, &fw.boot_size);
 
-	(void)snprintf(filename, sizeof filename, "%s/iwi-ucode-%s.fw", path,
+	snprintf(filename, sizeof filename, "%s/iwi-ucode-%s.fw", path,
 	    mode);
 	mmap_file(filename, &fw.ucode, &fw.ucode_size);
 
-	(void)snprintf(filename, sizeof filename, "%s/iwi-%s.fw", path, mode);
+	snprintf(filename, sizeof filename, "%s/iwi-%s.fw", path, mode);
 	mmap_file(filename, &fw.main, &fw.main_size);
 
 	if (do_req(iface, strstr(mode,"ibss") 
@@ -241,7 +241,7 @@ dump_debug(const char *iface)
 	snprintf(oid_name, sizeof oid_name, "hw.%s.firmware_logs", iface );
 	if (sysctlbyname(oid_name, 0, 0, &dump, len) == -1)
 		err(EX_OSERR, "Can't dump firmware logs");
-	(void)printf("All firmware logs dumped.\n");
+	printf("All firmware logs dumped.\n");
 }
 
 
@@ -256,7 +256,7 @@ get_radio_state(const char *iface)
 	if (sysctlbyname(oid_name, &radio, &len, NULL, 0) == -1)
 		err(EX_OSERR, "Can't get radio transmitter state");
 
-	(void)printf("Radio is %s\n", radio ? "ON" : "OFF");
+	printf("Radio is %s\n", radio ? "ON" : "OFF");
 }
 
 struct statistic {
@@ -335,6 +335,6 @@ get_statistics(const char *iface)
 		err(EX_OSERR, "Can't retrieve statistics");
 
 	for (stt = tbl; stt->index != 0; stt++)
-		(void)printf("%-60s[%u]\n", stt->desc, stats[stt->index]);
+		printf("%-60s[%u]\n", stt->desc, stats[stt->index]);
 }
 
diff --git a/usr.sbin/keyadmin/keyadmin.c b/usr.sbin/keyadmin/keyadmin.c
index 42b91faf9e..81ce5ca28a 100644
--- a/usr.sbin/keyadmin/keyadmin.c
+++ b/usr.sbin/keyadmin/keyadmin.c
@@ -73,7 +73,7 @@ Research Laboratory (NRL).
 
 /*
  *	$ANA: keyadmin.c,v 1.2 1996/06/13 19:42:40 wollman Exp $
- * $DragonFly: src/usr.sbin/keyadmin/keyadmin.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $
+ * $DragonFly: src/usr.sbin/keyadmin/keyadmin.c,v 1.4 2005/12/05 01:04:01 swildner Exp $
  */
 
 #include <sys/types.h>
@@ -272,8 +272,8 @@ pid_t mypid;
   help:   Print appropriate help message on stdout.
 
 ----------------------------------------------------------------------*/
-int help(cmdname)
-     char *cmdname;
+int
+help(char *cmdname)
 {
   int i;
 
@@ -306,7 +306,7 @@ int help(cmdname)
 
 ----------------------------------------------------------------------*/
 static void
-usage()
+usage(void)
 {
 
   fprintf(stderr, "usage: keyadmin <command> <args>\n");
@@ -316,10 +316,8 @@ usage()
   parsekey:  parse argument into a binary key and also record
              the length of the resulting key.
 ----------------------------------------------------------------------*/
-int parsekey(key, keylen, arg)
-     u_int8_t *key;
-     u_int8_t *keylen;
-     char *arg;
+int
+parsekey(u_int8_t *key, u_int8_t *keylen, char *arg)
 {
   int i, j, k, l;
   u_int8_t thisbyte;
@@ -370,9 +368,8 @@ int parsekey(key, keylen, arg)
   parsenametonum:   converts command-line name into index number.
 
 ----------------------------------------------------------------------*/
-int parsenametonum(tab, arg)
-     struct nametonum *tab;
-     char *arg;
+int
+parsenametonum(struct nametonum *tab, char *arg)
 {
   int i;
 
@@ -388,9 +385,8 @@ int parsenametonum(tab, arg)
   parsesockaddr:  Convert hostname arg into an appropriate sockaddr.
 
 ----------------------------------------------------------------------*/
-int parsesockaddr(sockaddr, arg)
-     struct sockaddr *sockaddr;
-     char *arg;
+int
+parsesockaddr(struct sockaddr *sockaddr, char *arg)
 {
   struct hostent *hostent;
   struct in_addr in_addr, *in_addrp;
@@ -450,9 +446,8 @@ int parsesockaddr(sockaddr, arg)
   dummyfromaddr:  Creates a zeroed sockaddr of family af.
 
 ----------------------------------------------------------------------*/
-void dummyfromaddr(sa, af)
-     struct sockaddr *sa;
-     int af;
+void
+dummyfromaddr(struct sockaddr *sa, int af)
 {
   int size;
 #ifdef INET6
@@ -478,9 +473,8 @@ void dummyfromaddr(sa, af)
   parse4:  parse keytype, spi, src addr, and dest addr from argv (command line)
            and stick in structure pointed to by key_messageptr.
 ----------------------------------------------------------------------*/
-int parse4(argc, argv)
-     int argc;
-     char *argv[];
+int
+parse4(int argc, char *argv[])
 {
   int i;
 
@@ -525,9 +519,8 @@ int parse4(argc, argv)
            from argv (command line)
            and stick in structure pointed to by key_messageptr.
 ----------------------------------------------------------------------*/
-int parse7(argc, argv)
-     int argc;
-     char *argv[];
+int
+parse7(int argc, char *argv[])
 {
   int i, j;
 
@@ -592,10 +585,8 @@ int parse7(argc, argv)
   parsecmdline:
 
 ----------------------------------------------------------------------*/
-int parsecmdline(buffer, argv, argc)
-     char *buffer;
-     char **argv;
-     int *argc;
+int
+parsecmdline(char *buffer, char **argv, int *argc)
 {
   int i = 0, iargc = 0;
   char *head;
@@ -628,8 +619,8 @@ int parsecmdline(buffer, argv, argc)
   load:   load keys from file filename into Key Engine.
 
 ----------------------------------------------------------------------*/
-int load(filename)
-     char *filename;
+int
+load(char *filename)
 {
   FILE *fh;
   char buffer[1024], *buf, *largv[KEYCMD_ARG_MAX], *c;
@@ -680,9 +671,7 @@ int load(filename)
 
 ----------------------------------------------------------------------*/
 int
-parsedata(km, kip)
-     struct key_msghdr *km;
-     struct key_msgdata *kip;
+parsedata(struct key_msghdr *km, struct key_msgdata *kip)
 {
   char *cp, *cpmax;
  
@@ -740,10 +729,8 @@ parsedata(km, kip)
   printkeyiv:
 
 ----------------------------------------------------------------------*/
-void printkeyiv(fp, cp, len)
-     FILE *fp;
-     caddr_t cp;
-     int len;
+void
+printkeyiv(FILE *fp, caddr_t cp, int len)
 {
   int i;
   for (i=0; i<len; i++)
@@ -754,9 +741,8 @@ void printkeyiv(fp, cp, len)
   printsockaddr:
 
 ----------------------------------------------------------------------*/
-void printsockaddr(fp, sa)
-     FILE *fp;
-     struct sockaddr *sa;
+void
+printsockaddr(FILE *fp, struct sockaddr *sa)
 {
   struct hostent *hp;
   char *addrp;
@@ -785,9 +771,7 @@ void printsockaddr(fp, sa)
 
 ----------------------------------------------------------------------*/
 char *
-parsenumtoname(tab, num)
-     struct nametonum *tab;
-     int num;
+parsenumtoname(struct nametonum *tab, int num)
 {
   int i;
   for (i = 0; tab[i].name; i++) {
@@ -802,9 +786,7 @@ parsenumtoname(tab, num)
 
 ----------------------------------------------------------------------*/
 int
-parsenumtoflag(tab, num)
-     struct nametonum *tab;
-     int num;
+parsenumtoflag(struct nametonum *tab, int num)
 {
   int i;
   for (i = 0; tab[i].name; i++) {
@@ -819,9 +801,8 @@ parsenumtoflag(tab, num)
   printkeymsg:
 
 ----------------------------------------------------------------------*/
-void printkeymsg(kmp, kdp)
-     struct key_msghdr *kmp;
-     struct key_msgdata *kdp;
+void
+printkeymsg(struct key_msghdr *kmp, struct key_msgdata *kdp)
 {
 
   printf("type=%d(%s) ",kmp->type, parsenumtoname(keytypes, kmp->type)); 
@@ -873,9 +854,8 @@ void printkeymsg(kmp, kdp)
   docmd:
 
 ----------------------------------------------------------------------*/
-int docmd(argc, argv)
-     int argc;
-     char **argv;
+int
+docmd(int argc, char **argv)
 {
   int i, j, seqno;
   int fd;
@@ -1151,9 +1131,8 @@ readmesg2:
   main:
 
 ----------------------------------------------------------------------*/
-int main(argc, argv)
-     int argc;
-     char *argv[];
+int
+main(int argc, char *argv[])
 {
   int i, j;
   u_long rcvsize;
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 93ba65f182..2f3398ab7c 100644
--- a/usr.sbin/keyserv/crypt_server.c
+++ b/usr.sbin/keyserv/crypt_server.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/keyserv/crypt_server.c,v 1.6.2.1 2001/07/19 04:21:20 kris Exp $
- * $DragonFly: src/usr.sbin/keyserv/crypt_server.c,v 1.5 2004/03/20 16:27:42 drhodus Exp $
+ * $DragonFly: src/usr.sbin/keyserv/crypt_server.c,v 1.6 2005/12/05 01:04:01 swildner Exp $
  */
 
 #include <sys/types.h>
@@ -80,8 +80,8 @@ static void prepare_key(unsigned char *key_data_ptr,int key_data_len,
 static void arcfour(unsigned char *buffer_ptr,int buffer_len,arcfour_key * key);
 static void swap_byte(unsigned char *a, unsigned char *b);
 
-static void prepare_key(unsigned char *key_data_ptr, int key_data_len,
-		 arcfour_key *key)
+static void
+prepare_key(unsigned char *key_data_ptr, int key_data_len, arcfour_key *key)
 {
    unsigned char index1;
    unsigned char index2;
@@ -105,7 +105,8 @@ static void prepare_key(unsigned char *key_data_ptr, int key_data_len,
    }       
 }
 
-static void arcfour(unsigned char *buffer_ptr, int buffer_len, arcfour_key *key)
+static void
+arcfour(unsigned char *buffer_ptr, int buffer_len, arcfour_key *key)
 { 
    unsigned char x;
    unsigned char y;
@@ -131,7 +132,8 @@ static void arcfour(unsigned char *buffer_ptr, int buffer_len, arcfour_key *key)
    key->y = y;
 }
 
-static void swap_byte(unsigned char *a, unsigned char *b)
+static void
+swap_byte(unsigned char *a, unsigned char *b)
 {
    unsigned char swapByte; 
    
@@ -141,7 +143,8 @@ static void swap_byte(unsigned char *a, unsigned char *b)
 }
 
 /* Dummy _des_crypt function that uses ARCFOUR with a 40 bit key */
-int _arcfour_crypt(char *buf, int len, struct desparams *desp)
+int
+_arcfour_crypt(char *buf, int len, struct desparams *desp)
 {
 	struct arcfour_key arcfourk;
 
@@ -169,7 +172,8 @@ static void *dlhandle;
 #define LIBCRYPTO "libcrypto.so.1"
 #endif
 
-void load_des(int warn, char *libpath)
+void
+load_des(int warn, char *libpath)
 {
 	char dlpath[MAXPATHLEN];
 
-- 
2.41.0