# HG changeset patch
# User jlarmour
# Date 1045063792 0
# Node ID 7df7eb129a74d0332a191178b6ee0908730c43a5
# Parent  af7aa9ef29530eb4866a87797e857a7ba683f03d
	* src/sys/kern/sockio.c: bsd_getinfo/bsd_setinfo should have
	void * args. Silences warnings.
	* src/sys/kern/uipc_socket.c (sopoll): Use __FUNCTION__ correctly
	for GCC 3.x.
	* src/sys/net/if_ethersubr.c: Put comments for stuff after endifs
	to silence warnings.
	* src/sys/net/if_loop.c: Ditto.

diff --git a/packages/net/bsd_tcpip/current/ChangeLog b/packages/net/bsd_tcpip/current/ChangeLog
--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-12  Jani Monoses  <jani@iv.ro>
+
+	* src/sys/kern/sockio.c: bsd_getinfo/bsd_setinfo should have
+	void * args. Silences warnings.
+	* src/sys/kern/uipc_socket.c (sopoll): Use __FUNCTION__ correctly
+	for GCC 3.x.
+	* src/sys/net/if_ethersubr.c: Put comments for stuff after endifs
+	to silence warnings.
+	* src/sys/net/if_loop.c: Ditto.
+
 2003-02-04  Gary Thomas  <gary@mlbassoc.com>
 
 	* include/sys/bsdtypes.h: Workaround when building with new
diff --git a/packages/net/bsd_tcpip/current/src/sys/kern/sockio.c b/packages/net/bsd_tcpip/current/src/sys/kern/sockio.c
--- a/packages/net/bsd_tcpip/current/src/sys/kern/sockio.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/sockio.c
@@ -145,8 +145,8 @@ static int bsd_select    (struct CYG_FIL
 static int bsd_fsync     (struct CYG_FILE_TAG *fp, int mode);        
 static int bsd_close     (struct CYG_FILE_TAG *fp);
 static int bsd_fstat     (struct CYG_FILE_TAG *fp, struct stat *buf);
-static int bsd_getinfo   (struct CYG_FILE_TAG *fp, int key, char *buf, int len);
-static int bsd_setinfo   (struct CYG_FILE_TAG *fp, int key, char *buf, int len);
+static int bsd_getinfo   (struct CYG_FILE_TAG *fp, int key, void *buf, int len);
+static int bsd_setinfo   (struct CYG_FILE_TAG *fp, int key, void *buf, int len);
 
 static int bsd_recvit    (cyg_file *fp, struct msghdr *mp, 
                           socklen_t *namelenp, ssize_t *retsize);
@@ -744,7 +744,7 @@ bsd_fstat(struct CYG_FILE_TAG *fp, struc
 // -------------------------------------------------------------------------
 
 static int 
-bsd_getinfo(struct CYG_FILE_TAG *fp, int key, char *buf, int len)
+bsd_getinfo(struct CYG_FILE_TAG *fp, int key, void *buf, int len)
 {
     return ENOSYS;
 }
@@ -752,7 +752,7 @@ bsd_getinfo(struct CYG_FILE_TAG *fp, int
 // -------------------------------------------------------------------------
 
 static int 
-bsd_setinfo(struct CYG_FILE_TAG *fp, int key, char *buf, int len)
+bsd_setinfo(struct CYG_FILE_TAG *fp, int key, void *buf, int len)
 {
     return ENOSYS;
 }
diff --git a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
--- a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
@@ -1484,7 +1484,7 @@ sohasoutofband(so)
 int
 sopoll(struct socket *so, int events, struct ucred *cred, struct proc *p)
 {
-    panic(__FUNCTION__"\n");
+    panic("%s\n", __FUNCTION__);
     return 0;
 #if 0 // POLL
 	int revents = 0;
diff --git a/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c b/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
--- a/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
@@ -242,7 +242,7 @@ ether_output(ifp, m, dst, rt0)
 	    }
 	    break;
 	  }
-#endif NETATALK
+#endif /* NETATALK */
 #ifdef NS
 	case AF_NS:
 		switch(ns_nettype){
@@ -634,7 +634,7 @@ ether_demux(ifp, eh, m)
 		/* probably this should be done with a NETISR as well */
                 aarpinput(IFP2AC(ifp), m); /* XXX */
                 return;
-#endif NETATALK
+#endif /* NETATALK */
 	default:
 #ifdef IPX
 		if (ef_inputp && ef_inputp(ifp, eh, m) == 0)
diff --git a/packages/net/bsd_tcpip/current/src/sys/net/if_loop.c b/packages/net/bsd_tcpip/current/src/sys/net/if_loop.c
--- a/packages/net/bsd_tcpip/current/src/sys/net/if_loop.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/if_loop.c
@@ -94,7 +94,7 @@
 #ifdef NETATALK
 #include <netatalk/at.h>
 #include <netatalk/at_var.h>
-#endif NETATALK
+#endif /* NETATALK */
 
 int loioctl __P((struct ifnet *, u_long, caddr_t));
 static void lortrequest __P((int, struct rtentry *, struct sockaddr *));
@@ -310,7 +310,7 @@ if_simloop(ifp, m, af, hlen)
 	        ifq = &atintrq2;
 		isr = NETISR_ATALK;
 		break;
-#endif NETATALK
+#endif /* NETATALK */
 	default:
 		printf("if_simloop: can't handle af=%d\n", af);
 		m_freem(m);