From 4181f14213046175c2e6e4599b6af3b5fa20787f Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Fri, 7 Jan 1994 23:36:15 +0000
Subject: [PATCH] Add some explicit return types, and make a bunch of things
 static.

---
 sys/vm/vm_map.c  | 14 +++++++-------
 sys/vm/vm_mmap.c | 20 ++++++++++++++++++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 4d2ffca65679..952d0042045d 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -273,7 +273,7 @@ vm_map_init(map, min, max, pageable)
  *	Allocates a VM map entry for insertion.
  *	No entry fields are filled in.  This routine is
  */
-vm_map_entry_t
+static vm_map_entry_t
 vm_map_entry_create(map)
 	vm_map_t	map;
 {
@@ -298,7 +298,7 @@ vm_map_entry_create(map)
  *
  *	Inverse of vm_map_entry_create.
  */
-void
+static void
 vm_map_entry_dispose(map, entry)
 	vm_map_t	map;
 	vm_map_entry_t	entry;
@@ -339,7 +339,7 @@ vm_map_entry_dispose(map, entry)
  *	Creates another valid reference to the given map.
  *
  */
-void
+static void
 vm_map_reference(map)
 	register vm_map_t	map;
 {
@@ -722,7 +722,7 @@ vm_map_find(map, object, offset, addr, length, find_space)
  *		removing extra sharing maps
  *		[XXX maybe later] merging with a neighbor
  */
-void
+static void
 vm_map_simplify_entry(map, entry)
 	vm_map_t	map;
 	vm_map_entry_t	entry;
@@ -1321,7 +1321,7 @@ vm_map_pageable(map, start, end, new_pageable)
  *	The map in question should be locked.
  *	[This is the reason for this routine's existence.]
  */
-void
+static void
 vm_map_entry_unwire(map, entry)
 	vm_map_t		map;
 	register vm_map_entry_t	entry;
@@ -1335,7 +1335,7 @@ vm_map_entry_unwire(map, entry)
  *
  *	Deallocate the given entry from the target map.
  */		
-void
+static void
 vm_map_entry_delete(map, entry)
 	register vm_map_t	map;
 	register vm_map_entry_t	entry;
@@ -1533,7 +1533,7 @@ vm_map_check_protection(map, start, end, protection)
  *	Copies the contents of the source entry to the destination
  *	entry.  The entries *must* be aligned properly.
  */
-void
+static void
 vm_map_copy_entry(src_map, dst_map, src_entry, dst_entry)
 	vm_map_t		src_map, dst_map;
 	register vm_map_entry_t	src_entry, dst_entry;
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 456df71ac695..526eaeead61f 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -37,7 +37,7 @@
  *
  *	from: Utah Hdr: vm_mmap.c 1.3 90/01/21
  *	from: @(#)vm_mmap.c	7.5 (Berkeley) 6/28/91
- *	$Id: vm_mmap.c,v 1.15 1993/12/20 12:40:13 cgd Exp $
+ *	$Id: vm_mmap.c,v 1.16 1994/01/07 23:36:27 mycroft Exp $
  */
 
 /*
@@ -66,7 +66,11 @@ int mmapdebug = 0;
 #define MDB_MAPIT	0x04
 #endif
 
+static boolean_t vm_map_is_allocated
+		    __P((vm_map_t, vm_offset_t, vm_offset_t, boolean_t));
+
 /* ARGSUSED */
+int
 getpagesize(p, uap, retval)
 	struct proc *p;
 	void *uap;
@@ -82,6 +86,7 @@ struct sbrk_args {
 };
 
 /* ARGSUSED */
+int
 sbrk(p, uap, retval)
 	struct proc *p;
 	struct sbrk_args *uap;
@@ -97,6 +102,7 @@ struct sstk_args {
 };
 
 /* ARGSUSED */
+int
 sstk(p, uap, retval)
 	struct proc *p;
 	struct sstk_args *uap;
@@ -116,6 +122,7 @@ struct smmap_args {
 	off_t	pos;
 };
 
+int
 smmap(p, uap, retval)
 	struct proc *p;
 	register struct smmap_args *uap;
@@ -241,6 +248,7 @@ struct msync_args {
 	int	len;
 };
 
+int
 msync(p, uap, retval)
 	struct proc *p;
 	struct msync_args *uap;
@@ -315,6 +323,7 @@ struct munmap_args {
 	int	len;
 };
 
+int
 munmap(p, uap, retval)
 	register struct proc *p;
 	register struct munmap_args *uap;
@@ -345,6 +354,7 @@ munmap(p, uap, retval)
 	return(0);
 }
 
+void
 munmapfd(p, fd)
 	register struct proc *p;
 {
@@ -365,6 +375,7 @@ struct mprotect_args {
 	int	prot;
 };
 
+int
 mprotect(p, uap, retval)
 	struct proc *p;
 	struct mprotect_args *uap;
@@ -412,6 +423,7 @@ struct madvise_args {
 };
 
 /* ARGSUSED */
+int
 madvise(p, uap, retval)
 	struct proc *p;
 	struct madvise_args *uap;
@@ -429,6 +441,7 @@ struct mincore_args {
 };
 
 /* ARGSUSED */
+int
 mincore(p, uap, retval)
 	struct proc *p;
 	struct mincore_args *uap;
@@ -446,6 +459,7 @@ mincore(p, uap, retval)
  *	MAP_FILE: a vnode pointer
  *	MAP_ANON: NULL or a file pointer
  */
+int
 vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
 	register vm_map_t map;
 	register vm_offset_t *addr;
@@ -719,6 +733,7 @@ out:
  * Given address and size it returns map attributes as well
  * as the (locked) object mapped at that location. 
  */
+int
 vm_region(map, addr, size, prot, max_prot, inheritance, shared, object, objoff)
 	vm_map_t	map;
 	vm_offset_t	*addr;		/* IN/OUT */
@@ -794,6 +809,7 @@ vm_region(map, addr, size, prot, max_prot, inheritance, shared, object, objoff)
 /*
  * Yet another bastard routine.
  */
+int
 vm_allocate_with_pager(map, addr, size, fitit, pager, poffset, internal)
 	register vm_map_t	map;
 	register vm_offset_t	*addr;
@@ -846,7 +862,7 @@ vm_allocate_with_pager(map, addr, size, fitit, pager, poffset, internal)
  *
  * start and end should be page aligned.
  */
-boolean_t
+static boolean_t
 vm_map_is_allocated(map, start, end, single_entry)
 	vm_map_t map;
 	vm_offset_t start, end;