Make everything except the unsupported network sources compile cleanly

with -Wnested-externs.

21 files changed, 33 insertions, 39 deletions

diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 80aba82..cfab4c7 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -1083,7 +1083,6 @@ fe_attach ( struct isa_device *isa_dev )
 	 * FIXME.
 	 */
 	if ( sc->sc_if.if_snd.ifq_maxlen == 0 ) {
-		extern int ifqmaxlen;		/* Don't be so shocked...  */
 		sc->sc_if.if_snd.ifq_maxlen = ifqmaxlen;
 	}
 
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 8f4b47a..605553f 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.23 1995/04/12 20:47:50 wollman Exp $
+ *	$Id: if_ie.c,v 1.24 1995/05/30 08:02:13 rgrimes Exp $
  */
 
 /*
@@ -109,6 +109,7 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
@@ -1558,7 +1559,6 @@ static int command_and_wait(unit, cmd, pcmd, mask)
 {
   volatile struct ie_cmd_common *cc = pcmd;
   volatile int timedout = 0;
-  extern int hz;
 
   ie_softc[unit].scb->ie_command = (u_short)cmd;
 
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 80aba82..cfab4c7 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -1083,7 +1083,6 @@ fe_attach ( struct isa_device *isa_dev )
 	 * FIXME.
 	 */
 	if ( sc->sc_if.if_snd.ifq_maxlen == 0 ) {
-		extern int ifqmaxlen;		/* Don't be so shocked...  */
 		sc->sc_if.if_snd.ifq_maxlen = ifqmaxlen;
 	}
 
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 8f4b47a..605553f 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.23 1995/04/12 20:47:50 wollman Exp $
+ *	$Id: if_ie.c,v 1.24 1995/05/30 08:02:13 rgrimes Exp $
  */
 
 /*
@@ -109,6 +109,7 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
@@ -1558,7 +1559,6 @@ static int command_and_wait(unit, cmd, pcmd, mask)
 {
   volatile struct ie_cmd_common *cc = pcmd;
   volatile int timedout = 0;
-  extern int hz;
 
   ie_softc[unit].scb->ie_command = (u_short)cmd;
 
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 3fede85..f6a7e39 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.17 1995/05/30 08:02:27 rgrimes Exp $
+ * $Id: if_ze.c,v 1.18 1995/07/25 22:18:55 bde Exp $
  */
 
 #include "ze.h"
@@ -147,6 +147,8 @@ int	ze_attach(), ze_ioctl(), ze_probe();
 void	ze_init(), ze_start(), ze_stop(), ze_intr();
 void	ze_reset(), ze_watchdog(), ze_get_packet();
 
+struct mbuf *ze_ring_to_mbuf __P((struct ze_softc *sc, char *src,
+				  struct mbuf *dst, int total_len));
 void 	ze_setup __P((struct ze_softc *sc));
 static inline void ze_rint();
 static inline void ze_xmit();
@@ -1465,7 +1467,7 @@ ze_get_packet(sc, buf, len)
 	u_short len;
 {
 	struct ether_header *eh;
-    	struct mbuf *m, *head = NULL, *ze_ring_to_mbuf();
+    	struct mbuf *m, *head = NULL;
 	u_short off;
 	int resid;
 	u_short etype;
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 760cbbb..dad3365 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -272,6 +272,8 @@ extern int labpcprobe(struct isa_device *dev);
 struct isa_driver labpcdriver =
 	{ labpcprobe, labpcattach, "labpc", 0 /* , labpcdetach */ };
 
+static void start(struct ctlr *ctlr);
+
 static void
 bp_done(struct buf *bp, int err)
 {
@@ -290,8 +292,6 @@ static void tmo_stop(void *p);
 static void
 done_and_start_next(struct ctlr *ctlr, struct buf *bp, int err)
 {
-	static void start(struct ctlr *ctlr);
-
 	bp->b_resid = ctlr->data_end - ctlr->data;
 
 	ctlr->data = 0;
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index cf6c316..10a6d2f 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -1047,9 +1047,6 @@ loop:
 				}
 				move;
 				struct timeval now;
-				/* from sys/kern/kern_time.c */
-				extern void timevalsub
-					(struct timeval *, struct timeval *);
 				dev_t dummy = makedev(0, mouse.minor);
 				struct tty *mousetty = get_pccons(dummy);
 				/*
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index cce878b..945ee24 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -66,6 +66,9 @@
 
 #include "pcvt_hdr.h"		/* global include */
 
+extern u_short csd_ascii[];	/* pcvt_tbl.h */
+extern u_short csd_supplemental[];
+
 static void check_scroll ( struct video_state *svsp );
 static void hp_entry ( U_char ch, struct video_state *svsp );
 static void vt_coldinit ( void );
@@ -889,9 +892,6 @@ sput (u_char *s, U_char kernel, int len, int page)
 static void
 vt_coldinit(void)
 {
-	extern u_short csd_ascii[];		/* pcvt_tbl.h */
-	extern u_short csd_supplemental[];
-
 	u_short volatile *cp = Crtat + (CGA_BUF-MONO_BUF)/CHR;
 	u_short was;
 	int nscr, charset;
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index ca1994c..d093efb 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -41,6 +41,8 @@
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_AUDIO) && !defined(EXCLUDE_SBPRO)
 
 extern int      sbc_base;
+extern int      sbc_major;
+extern int      sbc_minor;
 
 static int      sb16_dsp_ok = 0;	/*
 
@@ -467,8 +469,6 @@ set_irq_hw (int level)
 long
 sb16_dsp_init (long mem_start, struct address_info *hw_config)
 {
-  extern int      sbc_major, sbc_minor;
-
   if (sbc_major < 4)
     return mem_start;		/* Not a SB16 */
 
@@ -497,7 +497,6 @@ int
 sb16_dsp_detect (struct address_info *hw_config)
 {
   struct address_info *sb_config;
-  extern int      sbc_major;
 
   if (sb16_dsp_ok)
     return 1;			/* Can't drive two cards */
diff --git a/sys/i386/isa/sound/sb_mixer.c b/sys/i386/isa/sound/sb_mixer.c
index 8deaad5..b96c24c 100644
--- a/sys/i386/isa/sound/sb_mixer.c
+++ b/sys/i386/isa/sound/sb_mixer.c
@@ -42,6 +42,7 @@
 #undef SB_TEST_IRQ
 
 extern int      sbc_base;
+extern int      sbc_major;
 extern int      Jazz16_detected;
 
 static int      mixer_initialized = 0;
@@ -110,7 +111,6 @@ detect_mixer (void)
 
 #endif
   int             retcode = 1;
-  extern int      sbc_major;
 
   /*
    * Detect the mixer by changing parameters of two volume channels. If the
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index f387f99..6332c07 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id: uipc_domain.c,v 1.5 1995/05/11 00:13:04 wollman Exp $
+ * $Id: uipc_domain.c,v 1.6 1995/05/11 00:16:44 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,6 @@ void	pfslowtimo __P((void *));
 struct domain *domains;
 
 #define	ADDDOMAIN(x)	{ \
-	extern struct domain __CONCAT(x,domain); \
 	__CONCAT(x,domain.dom_next) = domains; \
 	domains = &__CONCAT(x,domain); \
 }
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 0b72465..a16626a 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.2 1994/08/02 07:43:04 davidg Exp $
+ * $Id: uipc_proto.c,v 1.3 1995/05/11 00:13:05 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 
 int	uipc_usrreq(), raw_usrreq();
 void	raw_init(),raw_input(),raw_ctlinput();
-extern	struct domain localdomain;		/* or at least forward */
 
 struct protosw localsw[] = {
 { SOCK_STREAM,	&localdomain,	0,	PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS,
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index c8fdcf4..91245c1 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.9 1995/05/30 08:06:25 rgrimes Exp $
+ *	$Id: uipc_usrreq.c,v 1.10 1995/08/08 02:22:16 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -696,7 +696,6 @@ unp_internalize(control, p)
 }
 
 int	unp_defer, unp_gcing;
-extern	struct domain localdomain;
 
 void
 unp_gc()
diff --git a/sys/net/if.h b/sys/net/if.h
index f7da7ab..cceba85 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id: if.h,v 1.18 1995/05/30 08:07:59 rgrimes Exp $
+ * $Id: if.h,v 1.19 1995/07/09 08:12:27 joerg Exp $
  */
 
 #ifndef _NET_IF_H_
@@ -355,6 +355,7 @@ struct	ifconf {
 		(ifa)->ifa_refcnt--;
 
 extern struct	ifnet	*ifnet;
+extern int	ifqmaxlen;
 extern struct	ifnet	loif[];
 
 void	ether_ifattach __P((struct ifnet *));
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 42037f1..80f5ce2 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -66,7 +66,6 @@
 int	tundebug = 0;
 
 struct tun_softc tunctl[NTUN];
-extern int ifqmaxlen;
 
 d_open_t tunopen;
 d_close_t tunclose;
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 93e77bd..1cb392f 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -16,7 +16,7 @@
  *
  * New configuration setup: dufault@hda.com
  *
- *      $Id: scsiconf.c,v 1.31 1995/06/14 12:28:32 amurai Exp $
+ *      $Id: scsiconf.c,v 1.32 1995/07/17 23:37:59 gibbs Exp $
  */
 
 #include <sys/types.h>
@@ -60,6 +60,8 @@ struct extend_array
 	void **ps;
 };
 
+static errval scsi_attach_sctarg __P((void));
+
 static void *extend_alloc(size_t s)
 {
 	void *p = malloc(s, M_DEVBUF, M_NOWAIT);
@@ -622,8 +624,6 @@ void scsi_configure_start(void)
 
 void scsi_configure_finish(void)
 {
-
-	static errval scsi_attach_sctarg __P((void));
 #if NSCTARG > 0
 	scsi_attach_sctarg();
 #endif
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 87021f6..323f1e7 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id: domain.h,v 1.4 1995/05/11 00:13:26 wollman Exp $
+ * $Id: domain.h,v 1.5 1995/05/15 22:55:18 davidg Exp $
  */
 
 #ifndef _SYS_DOMAIN_H_
@@ -65,6 +65,7 @@ struct	domain {
 
 #ifdef KERNEL
 extern struct	domain *domains;
+extern struct	domain localdomain;
 
 #define DOMAIN_SET(name) \
 	DATA_SET(domain_set, name ## domain);
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index d183d44..927c15b 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id: lfs_extern.h,v 1.5 1995/03/28 07:58:04 bde Exp $
+ * $Id: lfs_extern.h,v 1.6 1995/07/29 11:43:06 bde Exp $
  */
 
 #ifndef _UFS_LFS_LFS_EXTERN_H_
@@ -108,6 +108,7 @@ void	lfs_dump_super __P((struct lfs *));
 __END_DECLS
 
 extern int lfs_allclean_wakeup;
+extern int locked_queue_count;
 extern int (**lfs_vnodeop_p)();
 extern int (**lfs_specop_p)();
 extern int (**lfs_fifoop_p)();
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 454e8e4..0e21faa 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
- * $Id: lfs_segment.c,v 1.11 1995/05/30 08:15:22 rgrimes Exp $
+ * $Id: lfs_segment.c,v 1.12 1995/07/29 11:43:07 bde Exp $
  */
 
 #include <sys/param.h>
@@ -828,7 +828,6 @@ lfs_writeseg(fs, sp)
 	struct lfs *fs;
 	struct segment *sp;
 {
-	extern int locked_queue_count;
 	struct buf **bpp, *bp, *cbp;
 	SEGUSE *sup;
 	SEGSUM *ssp;
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 7bdc56d..14e2875 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.7 1995/07/13 08:48:17 davidg Exp $
+ *	$Id: swap_pager.h,v 1.8 1995/07/16 13:28:35 davidg Exp $
  */
 
 /*
@@ -64,6 +64,8 @@ struct swblock {
 typedef struct swblock *sw_blk_t;
 
 #ifdef KERNEL
+extern struct pagerlst swap_pager_un_object_list;
+
 void swap_pager_init __P((void));
 vm_object_t swap_pager_alloc __P((void *, vm_size_t, vm_prot_t, vm_offset_t));
 void swap_pager_dealloc __P((vm_object_t));
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 50191aa..b7fbc68 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.50 1995/07/16 13:28:36 davidg Exp $
+ * $Id: vm_object.c,v 1.51 1995/07/29 11:44:27 bde Exp $
  */
 
 /*
@@ -973,8 +973,6 @@ vm_object_collapse(object)
 					    object->backing_object_offset);
 					vm_object_pip_wakeup(object);
 				} else {
-					extern struct pagerlst swap_pager_un_object_list;
-
 					object->paging_in_progress++;
 					/*
 					 * move the shadow backing_object's pager data to