Fixes for various warnings

Joerg Sonnenberger joerg at britannica.bec.de
Sat Nov 29 07:01:25 PST 2003


This should be fine, please commit.
BTW is there a reason for bcopy to get volatile pointers?

Joerg
Index: net/bpf.c
===================================================================
RCS file: /home/repository/dragonflybsd/src/sys/net/bpf.c,v
retrieving revision 1.8
diff -u -r1.8 bpf.c
--- net/bpf.c	26 Aug 2003 20:49:47 -0000	1.8
+++ net/bpf.c	29 Nov 2003 12:48:11 -0000
@@ -1130,7 +1130,8 @@
 		++d->bd_rcount;
 		slen = bpf_filter(d->bd_filter, pkt, pktlen, pktlen);
 		if (slen != 0)
-			catchpacket(d, pkt, pktlen, slen, bcopy);
+			catchpacket(d, pkt, pktlen, slen,
+			    (void(*)(const void*, void*, size_t))bcopy);
 	}
 }
 
Index: dev/netif/ed/if_ed.c
===================================================================
RCS file: /home/repository/dragonflybsd/src/sys/dev/netif/ed/if_ed.c,v
retrieving revision 1.6
diff -u -r1.6 if_ed.c
--- dev/netif/ed/if_ed.c	20 Nov 2003 22:07:27 -0000	1.6
+++ dev/netif/ed/if_ed.c	29 Nov 2003 13:02:50 -0000
@@ -568,7 +568,7 @@
 
 	for (i = 0; i < memsize; ++i) {
 		if (sc->mem_start[i]) {
-			device_printf(dev, "failed to clear shared memory at %lx - check configuration\n",
+			device_printf(dev, "failed to clear shared memory at %llx - check configuration\n",
 				      kvtop(sc->mem_start + i));
 
 			/*
@@ -903,7 +903,7 @@
 
 	for (i = 0; i < memsize; ++i)
 		if (sc->mem_start[i]) {
-			device_printf(dev, "failed to clear shared memory at %lx - check configuration\n",
+			device_printf(dev, "failed to clear shared memory at %llx - check configuration\n",
 				      kvtop(sc->mem_start + i));
 			return (ENXIO);
 		}
Index: dev/netif/ie/if_ie.c
===================================================================
RCS file: /home/repository/dragonflybsd/src/sys/dev/netif/ie/if_ie.c,v
retrieving revision 1.5
diff -u -r1.5 if_ie.c
--- dev/netif/ie/if_ie.c	20 Nov 2003 22:07:29 -0000	1.5
+++ dev/netif/ie/if_ie.c	29 Nov 2003 11:11:15 -0000
@@ -455,7 +455,7 @@
 	c = (inb(PORT + IE507_MADDR) & 0x1c) + 0xc0;
 
 	if (kvtop(dvp->id_maddr) != ((int) c << 12)) {
-		printf("ie%d: kernel configured maddr %lx "
+		printf("ie%d: kernel configured maddr %llx "
 		       "doesn't match board configured maddr %x\n",
 		       unit, kvtop(dvp->id_maddr), (int) c << 12);
 		return (0);
@@ -642,7 +642,7 @@
 	}
 	dvp->id_msize = 0x8000;
 	if (kvtop(dvp->id_maddr) != bd_maddr) {
-		printf("ie%d: kernel configured maddr %lx "
+		printf("ie%d: kernel configured maddr %llx "
 		       "doesn't match board configured maddr %lx\n",
 		       unit, kvtop(dvp->id_maddr), bd_maddr);
 	}
Index: uipc_socket.c
===================================================================
RCS file: /home/repository/dragonflybsd/src/sys/kern/uipc_socket.c,v
retrieving revision 1.12
diff -u -r1.12 uipc_socket.c
--- uipc_socket.c	22 Sep 2003 20:04:33 -0000	1.12
+++ uipc_socket.c	28 Nov 2003 21:41:48 -0000
@@ -1268,7 +1268,9 @@
 	int	error, optval;
 	struct	linger l;
 	struct	timeval tv;
+#ifdef INET
 	struct accept_filter_arg *afap;
+#endif
 
 	error = 0;
 	if (sopt->sopt_level != SOL_SOCKET) {




More information about the Submit mailing list