Fix up some sloppy coding practices:

- Delete redundant declarations.
- Add -Wredundant-declarations to Makefile.i386 so they don't come back.
- Delete sloppy COMMON-style declarations of uninitialized data in
  header files.
- Add a few prototypes.
- Clean up warnings resulting from the above.

NB: ioconf.c will still generate a redundant-declaration warning, which
is unavoidable unless somebody volunteers to make `config' smarter.

9 files changed, 36 insertions, 53 deletions

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index ad3d3db..b645887 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.5 1994/08/06 09:15:36 davidg Exp $
+ * $Id: swap_pager.c,v 1.6 1994/08/07 13:10:37 davidg Exp $
  */
 
 /*
@@ -69,16 +69,13 @@
 #define NPENDINGIO	16
 #endif
 
-extern int nswbuf;
 int nswiodone;
 extern int vm_pageout_rate_limit;
 static int cleandone;
 extern int hz;
 int swap_pager_full;
 extern vm_map_t pager_map;
-extern int vm_pageout_pages_needed;
 extern int vm_swap_size;
-extern struct vnode *swapdev_vp;
 
 #define MAX_PAGEOUT_CLUSTER 8
 
@@ -105,19 +102,6 @@ extern vm_map_t kernel_map;
 
 #define SWB_EMPTY (-1)
 
-void		swap_pager_init(void);
-vm_pager_t	swap_pager_alloc(caddr_t, vm_size_t, vm_prot_t, vm_offset_t);
-void		swap_pager_dealloc(vm_pager_t);
-boolean_t	swap_pager_getpage(vm_pager_t, vm_page_t, boolean_t);
-boolean_t	swap_pager_putpage(vm_pager_t, vm_page_t, boolean_t);
-boolean_t	swap_pager_getmulti(vm_pager_t, vm_page_t *, int, int, boolean_t);
-boolean_t	swap_pager_haspage(vm_pager_t, vm_offset_t);
-int		swap_pager_io(sw_pager_t, vm_page_t *, int, int, int);
-void		swap_pager_iodone(struct buf *);
-boolean_t	swap_pager_clean();
-
-extern struct pagerops swappagerops;
-
 struct swpclean swap_pager_done;	/* list of compileted page cleans */
 struct swpclean swap_pager_inuse;	/* list of pending page cleans */
 struct swpclean swap_pager_free;	/* list of free pager clean structs */
@@ -145,8 +129,6 @@ struct pagerops swappagerops = {
 	swap_pager_haspage
 };
 
-extern int nswbuf;
-
 int npendingio = NPENDINGIO;
 int pendingiowait;
 int require_swap_init;
@@ -169,8 +151,6 @@ static inline void swapsizecheck() {
 void
 swap_pager_init()
 {
-	extern int dmmin, dmmax;
-
 	dfltpagerops = &swappagerops;
 
 	TAILQ_INIT(&swap_pager_list);
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 4fcfb97..2fc7aba 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.4 1994/08/04 03:06:43 davidg Exp $
+ * $Id: vm_glue.c,v 1.5 1994/08/09 10:42:41 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -84,7 +84,6 @@ int	avefree = 0;		/* XXX */
 int	readbuffers = 0;	/* XXX allow kgdb to read kernel buffer pool */
 /* vm_map_t upages_map; */
 
-void swapout(struct proc *p);
 int
 kernacc(addr, len, rw)
 	caddr_t addr;
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index c64c2df..072c906 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.5 1994/08/07 13:10:39 davidg Exp $
+ * $Id: vm_kern.c,v 1.6 1994/08/07 14:53:26 davidg Exp $
  */
 
 /*
@@ -70,12 +70,23 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_kern.h>
 
+vm_map_t	buffer_map;
+vm_map_t	kernel_map;
+vm_map_t	kmem_map;
+vm_map_t	mb_map;
+vm_map_t	io_map;
+vm_map_t	clean_map;
+vm_map_t	pager_map;
+vm_map_t	phys_map;
+
 /*
  *	kmem_alloc_pageable:
  *
@@ -117,7 +128,6 @@ vm_offset_t kmem_alloc(map, size)
 {
 	vm_offset_t		addr;
 	register vm_offset_t	offset;
-	extern vm_object_t	kernel_object;
 	vm_offset_t		i;
 
 	size = round_page(size);
@@ -278,7 +288,6 @@ kmem_malloc(map, size, canwait)
 	vm_map_entry_t		entry;
 	vm_offset_t		addr;
 	vm_page_t		m;
-	extern vm_object_t	kmem_object;
 
 	if (map != kmem_map && map != mb_map)
 		panic("kern_malloc_alloc: map != {kmem,mb}_map");
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 5c82528..087dd37 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -61,16 +61,20 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id$
+ * $Id: vm_kern.h,v 1.3 1994/08/02 07:55:23 davidg Exp $
  */
 
+#ifndef _VM_VM_KERN_H_
+#define _VM_VM_KERN_H_ 1
+
 /* Kernel memory management definitions. */
+extern vm_map_t	buffer_map;
+extern vm_map_t	kernel_map;
+extern vm_map_t	kmem_map;
+extern vm_map_t	mb_map;
+extern vm_map_t	io_map;
+extern vm_map_t	clean_map;
+extern vm_map_t	pager_map;
+extern vm_map_t	phys_map;
 
-vm_map_t	buffer_map;
-vm_map_t	kernel_map;
-vm_map_t	kmem_map;
-vm_map_t	mb_map;
-vm_map_t	io_map;
-vm_map_t	clean_map;
-vm_map_t	pager_map;
-vm_map_t	phys_map;
+#endif /* _VM_VM_KERN_H_ */
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 8ad42fa..48c6129 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.3 1994/08/02 07:55:25 davidg Exp $
+ * $Id: vm_map.c,v 1.4 1994/08/04 19:40:47 davidg Exp $
  */
 
 /*
@@ -141,7 +141,6 @@ vm_map_entry_t	kentry_free;
 vm_map_t	kmap_free;
 
 int		kentry_count;
-vm_map_t	kmap_free;
 static vm_offset_t mapvm=0;
 static int	mapvmpgcnt=0;
 
@@ -241,7 +240,6 @@ vm_map_t vm_map_create(pmap, min, max, pageable)
 	boolean_t	pageable;
 {
 	register vm_map_t	result;
-	extern vm_map_t		kmem_map;
 
 	if (kmem_map == NULL) {
 		result = kmap_free;
@@ -292,7 +290,6 @@ vm_map_init(map, min, max, pageable)
  */
 static struct vm_map_entry *mappool;
 static int mappoolcnt;
-void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry);
 
 vm_map_entry_t
 vm_map_entry_create(map)
@@ -371,7 +368,6 @@ vm_map_entry_dispose(map, entry)
 	vm_map_t	map;
 	vm_map_entry_t	entry;
 {
-	extern vm_map_t		kernel_map, kmem_map, pager_map;
 	int s;
 
 	if (map == kernel_map || map == kmem_map || map == pager_map ||
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 57b66ec..3bdb0a2 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.3 1994/08/02 07:55:29 davidg Exp $
+ * $Id: vm_object.c,v 1.4 1994/08/07 13:10:40 davidg Exp $
  */
 
 /*
@@ -70,6 +70,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>		/* for curproc, pageproc */
 #include <sys/malloc.h>
 
 #include <vm/vm.h>
@@ -77,9 +79,6 @@
 #include <vm/vm_pageout.h>
 
 static void _vm_object_allocate(vm_size_t, vm_object_t);
-void vm_object_deactivate_pages(vm_object_t);
-void vm_object_cache_trim(void);
-void vm_object_remove(vm_pager_t);
 
 /*
  *	Virtual memory objects maintain the actual data
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index d0b0d5a..b56d719 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.6 1994/08/04 03:06:47 davidg Exp $
+ * $Id: vm_pageout.c,v 1.7 1994/08/06 09:15:39 davidg Exp $
  */
 
 /*
@@ -732,8 +732,8 @@ rescan1:
 void
 vm_pageout()
 {
-	extern npendingio, swiopend;
-	static nowakeup;
+	extern swiopend;
+	static int nowakeup;
 	(void) spl0();
 
 	/*
@@ -765,7 +765,6 @@ vmretry:
 	 */
 	while (TRUE) {
 		int force_wakeup;
-		extern struct loadavg averunnable;
 /*
 		cnt.v_free_min = 12 + averunnable.ldavg[0] / 1024;
 		cnt.v_free_target = 2*cnt.v_free_min + cnt.v_free_reserved;
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 5412ddb..66f0bbe 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id$
+ * $Id: vm_pageout.h,v 1.3 1994/08/02 07:55:34 davidg Exp $
  */
 
 /*
@@ -91,7 +91,6 @@ extern int vm_pageout_pages_needed;
 #define VM_WAIT vm_wait()
 
 inline static void vm_wait() {
-	extern struct proc *curproc, *pageproc;
 	int s;
 	s = splhigh();
 	if (curproc == pageproc) {
@@ -107,7 +106,6 @@ inline static void vm_wait() {
 
 
 #ifdef KERNEL
-void		 vm_pageout __P((void));
 int		 vm_pageout_scan __P((void));
 void		 vm_pageout_page __P((vm_page_t, vm_object_t));
 void		 vm_pageout_cluster __P((vm_page_t, vm_object_t));
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 47d3c3d..b080263 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.5 1994/08/07 13:10:42 davidg Exp $
+ * $Id: vm_pager.c,v 1.6 1994/08/07 14:53:27 davidg Exp $
  */
 
 /*
@@ -187,7 +187,6 @@ vm_pager_get_pages(pager, m, count, reqpage, sync)
 	int		reqpage;
 	boolean_t	sync;
 {
-	extern boolean_t vm_page_zero_fill();
 	extern int vm_pageout_count;
 	int i;