Warner Losh <[EMAIL PROTECTED]> writes:
> Thank you for your opinion.  However, make universe is not worthless.
> If doing one, and checking the output for errors, isn't sufficient to
> get tinderbox to not whine, then tinderbox is broken.

Thank you for *your* opinion, but the tinderbox is not at fault here.
The fact of the matter is that LINT is broken, as a simple 'make
buildkernel KERNCONF=LINT' will show.

The attached patch unbreaks the build.

DES
-- 
Dag-Erling Smørgrav - [EMAIL PROTECTED]

Index: sys/netinet/tcp_fsm.h
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_fsm.h,v
retrieving revision 1.19
diff -u -r1.19 tcp_fsm.h
--- sys/netinet/tcp_fsm.h	11 May 2007 10:50:31 -0000	1.19
+++ sys/netinet/tcp_fsm.h	30 Jul 2007 09:08:26 -0000
@@ -102,7 +102,7 @@
 #endif
 
 #ifdef	TCPSTATES
-const char *tcpstates[] = {
+static const char *tcpstates[] = {
 	"CLOSED",	"LISTEN",	"SYN_SENT",	"SYN_RCVD",
 	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
 	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
Index: sys/netinet/tcp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.159
diff -u -r1.159 tcp_usrreq.c
--- sys/netinet/tcp_usrreq.c	29 Jul 2007 01:31:33 -0000	1.159
+++ sys/netinet/tcp_usrreq.c	30 Jul 2007 09:08:19 -0000
@@ -87,10 +87,6 @@
 /*
  * TCP protocol interface to socket abstraction.
  */
-#ifdef	TCPDEBUG
-extern	const char *tcpstates[];
-#endif
-
 static int	tcp_attach(struct socket *);
 static int	tcp_connect(struct tcpcb *, struct sockaddr *,
 		    struct thread *td);
Index: sys/netipx/spx_debug.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/spx_debug.c,v
retrieving revision 1.18
diff -u -r1.18 spx_debug.c
--- sys/netipx/spx_debug.c	11 May 2007 10:38:34 -0000	1.18
+++ sys/netipx/spx_debug.c	30 Jul 2007 09:19:46 -0000
@@ -69,6 +69,8 @@
 #include <sys/systm.h>
 #include <sys/protosw.h>
 
+#define TCPSTATES		/* for logging */
+
 #include <netinet/in_systm.h>
 #include <netinet/tcp_fsm.h>
 
Index: sys/netipx/spx_debug.h
===================================================================
RCS file: /home/ncvs/src/sys/netipx/spx_debug.h,v
retrieving revision 1.17
diff -u -r1.17 spx_debug.h
--- sys/netipx/spx_debug.h	11 May 2007 10:38:34 -0000	1.17
+++ sys/netipx/spx_debug.h	30 Jul 2007 09:12:44 -0000
@@ -95,7 +95,6 @@
 #ifdef _KERNEL
 extern char *prurequests[];
 extern char *sanames[];
-extern char *tcpstates[];
 
 void	spx_trace(short act, u_char ostate, struct spxpcb *sp, struct spx *si,
 	    int req);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"

Reply via email to