From bbe22a594722d4ddbd70e26225ce31abdfffedd8 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Fri, 7 Jan 1994 22:34:37 +0000
Subject: [PATCH] Add some explicit return types.

---
 sys/vm/vm_map.c   |  8 ++------
 sys/vm/vm_meter.c |  7 ++++++-
 sys/vm/vm_swap.c  |  7 ++++++-
 sys/vm/vm_unix.c  |  4 +++-
 sys/vm/vm_user.c  | 11 +++++++++--
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 08d1f2d620d2..4d2ffca65679 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -117,8 +117,6 @@
  *	occurs.
  */
 
-int vm_map_delete(vm_map_t, vm_offset_t, vm_offset_t);
-
 /*
  *	vm_map_startup:
  *
@@ -799,7 +797,7 @@ vm_map_simplify_entry(map, entry)
  *	This routine is called only when it is known that
  *	the entry must be split.
  */
-void
+static void
 _vm_map_clip_start(map, entry, start)
 	register vm_map_t	map;
 	register vm_map_entry_t	entry;
@@ -843,8 +841,6 @@ _vm_map_clip_start(map, entry, start)
  *	the specified address; if necessary,
  *	it splits the entry into two.
  */
-
-void _vm_map_clip_end();
 #define vm_map_clip_end(map, entry, endaddr) \
 { \
 	if (endaddr < entry->end) \
@@ -855,7 +851,7 @@ void _vm_map_clip_end();
  *	This routine is called only when it is known that
  *	the entry must be split.
  */
-void
+static void
 _vm_map_clip_end(map, entry, end)
 	register vm_map_t	map;
 	register vm_map_entry_t	entry;
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 9af5dc72ce61..b6f95c251cac 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_meter.c	7.11 (Berkeley) 4/20/91
- *	$Id: vm_meter.c,v 1.7 1993/12/20 12:40:11 cgd Exp $
+ *	$Id: vm_meter.c,v 1.8 1994/01/07 22:38:25 mycroft Exp $
  */
 
 #include <sys/param.h>
@@ -53,6 +53,9 @@ int	maxslp = MAXSLP;
 int	saferss = SAFERSS;
 #endif /* MACHINE_NONCONTIG */
 
+static void vmtotal __P((void));
+static void loadav __P((fixpt_t *, int));
+
 void
 vmmeter()
 {
@@ -64,6 +67,7 @@ vmmeter()
 		wakeup((caddr_t)&proc0);
 }
 
+static void
 vmtotal()
 {
 	register struct proc *p;
@@ -136,6 +140,7 @@ fixpt_t	cexp[3] = {
  * Compute a tenex style load average of a quantity on
  * 1, 5 and 15 minute intervals.
  */
+static void
 loadav(avg, n)
 	register fixpt_t *avg;
 	int n;
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 8813a1300733..b216adef6392 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_swap.c	7.18 (Berkeley) 5/6/91
- *	$Id: vm_swap.c,v 1.14 1993/12/20 12:40:26 cgd Exp $
+ *	$Id: vm_swap.c,v 1.15 1994/01/07 22:34:37 mycroft Exp $
  */
 
 #include <sys/param.h>
@@ -52,6 +52,8 @@
 
 int	nswap, nswdev;
 
+static int swfree __P((struct proc *, int));
+
 /*
  * Set up swap devices.
  * Initialize linked list of free swap
@@ -103,6 +105,7 @@ swapinit()
 	sp->av_forw = NULL;
 }
 
+void
 swstrategy(bp)
 	register struct buf *bp;
 {
@@ -179,6 +182,7 @@ struct swapon_args {
 };
 
 /* ARGSUSED */
+int
 swapon(p, uap, retval)
 	struct proc *p;
 	struct swapon_args *uap;
@@ -232,6 +236,7 @@ swapon(p, uap, retval)
  * space, which is laid out with blocks of dmmax pages circularly
  * among the devices.
  */
+static int
 swfree(p, index)
 	struct proc *p;
 	int index;
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index 848a970bc68e..b0f0afdbb8cc 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -37,7 +37,7 @@
  *
  *	from: Utah Hdr: vm_unix.c 1.1 89/11/07
  *	from: @(#)vm_unix.c	7.2 (Berkeley) 4/20/91
- *	$Id: vm_unix.c,v 1.7 1993/12/20 12:40:27 cgd Exp $
+ *	$Id: vm_unix.c,v 1.8 1994/01/07 22:34:41 mycroft Exp $
  */
 
 /*
@@ -55,6 +55,7 @@ struct obreak_args {
 };
 
 /* ARGSUSED */
+int
 obreak(p, uap, retval)
 	struct proc *p;
 	struct obreak_args *uap;
@@ -126,6 +127,7 @@ struct ovadvise_args {
 };
 
 /* ARGSUSED */
+int
 ovadvise(p, uap, retval)
 	struct proc *p;
 	struct ovadvise_args *uap;
diff --git a/sys/vm/vm_user.c b/sys/vm/vm_user.c
index 9b3892037edc..0a9347a82dd3 100644
--- a/sys/vm/vm_user.c
+++ b/sys/vm/vm_user.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_user.c	7.3 (Berkeley) 4/21/91
- *	$Id: vm_user.c,v 1.5 1993/12/20 12:40:28 cgd Exp $
+ *	$Id: vm_user.c,v 1.6 1994/01/07 22:40:12 mycroft Exp $
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -89,6 +89,7 @@ struct svm_allocate_args {
 };
 
 /* ARGSUSED */
+int
 svm_allocate(p, uap, retval)
 	struct proc *p;
 	struct svm_allocate_args *uap;
@@ -117,6 +118,7 @@ struct svm_deallocate_args {
 };
 
 /* ARGSUSED */
+int
 svm_deallocate(p, uap, retval)
 	struct proc *p;
 	struct svm_deallocate_args *uap;
@@ -137,6 +139,7 @@ struct svm_inherit_args {
 };
 
 /* ARGSUSED */
+int
 svm_inherit(p, uap, retval)
 	struct proc *p;
 	struct svm_inherit_args *uap;
@@ -158,6 +161,7 @@ struct svm_protect_args {
 };
 
 /* ARGSUSED */
+int
 svm_protect(p, uap, retval)
 	struct proc *p;
 	struct svm_protect_args *uap;
@@ -175,6 +179,7 @@ svm_protect(p, uap, retval)
  *	vm_allocate allocates "zero fill" memory in the specfied
  *	map.
  */
+int
 vm_allocate(map, addr, size, anywhere)
 	register vm_map_t	map;
 	register vm_offset_t	*addr;
@@ -206,6 +211,7 @@ vm_allocate(map, addr, size, anywhere)
  *	vm_deallocate deallocates the specified range of addresses in the
  *	specified address map.
  */
+int
 vm_deallocate(map, start, size)
 	register vm_map_t	map;
 	vm_offset_t		start;
@@ -224,6 +230,7 @@ vm_deallocate(map, start, size)
  *	vm_inherit sets the inheritence of the specified range in the
  *	specified map.
  */
+int
 vm_inherit(map, start, size, new_inheritance)
 	register vm_map_t	map;
 	vm_offset_t		start;
@@ -240,7 +247,7 @@ vm_inherit(map, start, size, new_inheritance)
  *	vm_protect sets the protection of the specified range in the
  *	specified map.
  */
-
+int
 vm_protect(map, start, size, set_maximum, new_protection)
 	register vm_map_t	map;
 	vm_offset_t		start;