From 4802d5a777a347a870d9a32342378a5f63b005f9 Mon Sep 17 00:00:00 2001
From: Hiten Pandya <hmp@dragonflybsd.org>
Date: Tue, 4 May 2004 11:56:54 +0000
Subject: [PATCH] Move around some #ifdefs to silence warnings.

While I am cleaning, add a #warning about spp_usrreq() not being
up-to-speed with reality.

Noticed-by: 	LINT
---
 sys/netproto/ns/ns_pcb.c     | 4 ++--
 sys/netproto/ns/spp_usrreq.c | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys/netproto/ns/ns_pcb.c b/sys/netproto/ns/ns_pcb.c
index 9879a01851..b8377035fe 100644
--- a/sys/netproto/ns/ns_pcb.c
+++ b/sys/netproto/ns/ns_pcb.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ns_pcb.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/ns_pcb.c,v 1.9 1999/08/28 00:49:51 peter Exp $
- * $DragonFly: src/sys/netproto/ns/ns_pcb.c,v 1.6 2004/02/16 20:37:20 dillon Exp $
+ * $DragonFly: src/sys/netproto/ns/ns_pcb.c,v 1.7 2004/05/04 11:56:54 hmp Exp $
  */
 
 #include <sys/param.h>
@@ -96,9 +96,9 @@ ns_pcbbind(nsp, nam)
 	}
 	lport = sns->sns_port;
 	if (lport) {
+#ifdef	NS_PRIV_SOCKETS
 		u_short aport = ntohs(lport);
 
-#ifdef	NS_PRIV_SOCKETS
 		if (aport < NSPORT_RESERVED &&
 		    (nsp->nsp_socket->so_state & SS_PRIV) == 0)
 			return (EACCES);
diff --git a/sys/netproto/ns/spp_usrreq.c b/sys/netproto/ns/spp_usrreq.c
index c8445d6eb4..0a28c6a240 100644
--- a/sys/netproto/ns/spp_usrreq.c
+++ b/sys/netproto/ns/spp_usrreq.c
@@ -32,7 +32,7 @@
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/spp_usrreq.c,v 1.11 1999/08/28 00:49:53 peter Exp $
- * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
+ * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.8 2004/05/04 11:56:54 hmp Exp $
  */
 
 #include <sys/param.h>
@@ -1266,6 +1266,7 @@ spp_ctloutput(req, so, level, name, value)
 		return (error);
 }
 
+#warning "spp_usrreq not converted to FreeBSD usrreq style! watch out!"
 /*ARGSUSED*/
 int
 spp_usrreq(so, req, m, nam, controlp)
@@ -1273,14 +1274,15 @@ spp_usrreq(so, req, m, nam, controlp)
 	int req;
 	struct mbuf *m, *nam, *controlp;
 {
+	int error = 0;
+#ifdef OBSOLETE		/* not converted to FreeBSD usrreq style XXX */
 	struct nspcb *nsp = sotonspcb(so);
 	struct sppcb *cb = NULL;
 	int s = splnet();
-	int error = 0, ostate;
+	int ostate;
 	struct mbuf *mm;
 	struct sockbuf *sb;
 
-#ifdef OBSOLETE		/* not converted to FreeBSD usrreq style XXX */
 	if (req == PRU_CONTROL)
                 return (ns_control(so, (int)m, (caddr_t)nam,
 			(struct ifnet *)controlp));
-- 
2.41.0