Proper prototypes and return values.

2 files changed, 21 insertions, 42 deletions

diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c
index 5cc4a3dbb1b..5c108e9a9d8 100644
--- a/sys/arch/alpha/stand/boot/disk.c
+++ b/sys/arch/alpha/stand/boot/disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.c,v 1.15 2014/07/12 21:03:38 tedu Exp $	*/
+/*	$OpenBSD: disk.c,v 1.16 2015/07/17 16:13:26 miod Exp $	*/
 /*	$NetBSD: disk.c,v 1.6 1997/04/06 08:40:33 cgd Exp $	*/
 
 /*
@@ -54,13 +54,8 @@ struct	disk_softc {
 };
 
 int
-diskstrategy(devdata, rw, bn, reqcnt, addrvoid, cnt)
-	void *devdata;
-	int rw;
-	daddr32_t bn;
-	size_t reqcnt;
-	void *addrvoid;
-	size_t *cnt;	/* out: number of bytes transferred */
+diskstrategy(void *devdata, int rw, daddr32_t bn, size_t reqcnt, void *addrvoid,
+    size_t *cnt)
 {
 	char *addr = addrvoid;
 	struct disk_softc *sc;
@@ -91,9 +86,7 @@ diskstrategy(devdata, rw, bn, reqcnt, addrvoid, cnt)
 }
 
 int
-diskopen(f, ctlr, unit, part)
-	struct open_file *f;
-	int ctlr, unit, part;
+diskopen(struct open_file *f, int ctlr, int unit, int part)
 {
 	struct disklabel *lp;
 	prom_return_t ret;
@@ -162,8 +155,8 @@ bad:		free(sc, sizeof(struct disk_softc));
 	return (0);
 }
 
-diskclose(f)
-	struct open_file *f;
+int
+diskclose(struct open_file *f)
 {
 	struct disk_softc *sc;
 
diff --git a/sys/arch/alpha/stand/netboot/if_prom.c b/sys/arch/alpha/stand/netboot/if_prom.c
index 0226997ff58..0cd674ff08e 100644
--- a/sys/arch/alpha/stand/netboot/if_prom.c
+++ b/sys/arch/alpha/stand/netboot/if_prom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_prom.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
+/*	$OpenBSD: if_prom.c,v 1.7 2015/07/17 16:13:26 miod Exp $	*/
 /*	$NetBSD: if_prom.c,v 1.9 1997/04/06 08:41:26 cgd Exp $	*/
 
 /*
@@ -46,12 +46,12 @@
 
 #include "stand/bbinfo.h"
 
-int prom_probe();
-int prom_match();
-void prom_init();
-int prom_get();
-int prom_put();
-void prom_end();
+int	prom_match(struct netif *, void *);
+int	prom_probe(struct netif *, void *);
+void	prom_init(struct iodesc *, void *);
+int	prom_get(struct iodesc *, void *, size_t, time_t);
+int	prom_put(struct iodesc *, void *, size_t);
+void	prom_end(struct netif *);
 
 extern struct netif_stats	prom_stats[];
 
@@ -87,28 +87,21 @@ struct netif_driver prom_netif_driver = {
 int netfd, broken_firmware;
 
 int
-prom_match(nif, machdep_hint)
-	struct netif *nif;
-	void *machdep_hint;
+prom_match(struct netif *nif, void *machdep_hint)
 {
 
 	return (1);
 }
 
 int
-prom_probe(nif, machdep_hint)
-	struct netif *nif;
-	void *machdep_hint;
+prom_probe(struct netif *nif, void *machdep_hint)
 {
 
 	return 0;
 }
 
 int
-prom_put(desc, pkt, len)
-	struct iodesc *desc;
-	void *pkt;
-	int len;
+prom_put(struct iodesc *desc, void *pkt, size_t len)
 {
 
 	prom_write(netfd, len, pkt, 0);
@@ -118,15 +111,11 @@ prom_put(desc, pkt, len)
 
 
 int
-prom_get(desc, pkt, len, timeout)
-	struct iodesc *desc;
-	void *pkt;
-	int len;
-	time_t timeout;
+prom_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout)
 {
 	prom_return_t ret;
 	time_t t;
-	int cc;
+	ssize_t cc;
 	char hate[2000];
 
 	t = getsecs();
@@ -140,7 +129,7 @@ prom_get(desc, pkt, len, timeout)
 			cc = ret.u.retval;
 	}
 	if (broken_firmware)
-		cc = min(cc, len);
+		cc = lmin(cc, len);
 	else
 		cc = len;
 	bcopy(hate, pkt, cc);
@@ -151,9 +140,7 @@ prom_get(desc, pkt, len, timeout)
 extern char *strchr();
 
 void
-prom_init(desc, machdep_hint)
-	struct iodesc *desc;
-	void *machdep_hint;
+prom_init(struct iodesc *desc, void *machdep_hint)
 {
 	prom_return_t ret;
 	char devname[64];
@@ -250,8 +237,7 @@ reallypunt:
 }
 
 void
-prom_end(nif)
-	struct netif *nif;
+prom_end(struct netif *nif)
 {
 
 	prom_close(netfd);