Prep for hidden visibility: move the vnode/file related function

declarations, including _kvm_getftype(), into a new header, kvm_file.h,
so that we don't have to pull <sys/vnode.h> into all the .c files.  No
more extern function declaration in .c files.

ok millert@

6 files changed, 54 insertions, 12 deletions

diff --git a/lib/libkvm/kvm_cd9660.c b/lib/libkvm/kvm_cd9660.c
index 18218f3363c..8e4566cda9d 100644
--- a/lib/libkvm/kvm_cd9660.c
+++ b/lib/libkvm/kvm_cd9660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_cd9660.c,v 1.4 2013/10/22 16:40:26 guenther Exp $	*/
+/*	$OpenBSD: kvm_cd9660.c,v 1.5 2013/11/16 00:37:11 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -33,6 +33,7 @@
 #include <db.h>
 
 #include "kvm_private.h"
+#include "kvm_file.h"
 
 int
 _kvm_stat_cd9660(kvm_t *kd, struct kinfo_file *kf, struct vnode *vp)
diff --git a/lib/libkvm/kvm_file.h b/lib/libkvm/kvm_file.h
new file mode 100644
index 00000000000..fea2859f90d
--- /dev/null
+++ b/lib/libkvm/kvm_file.h
@@ -0,0 +1,45 @@
+/*	$OpenBSD: kvm_file.h,v 1.1 2013/11/16 00:37:11 guenther Exp $ */
+/*	$NetBSD: kvm_private.h,v 1.7 1996/05/05 04:32:15 gwr Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software developed by the Computer Systems
+ * Engineering group at Lawrence Berkeley Laboratory under DARPA contract
+ * BG 91-66 and contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)kvm_private.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * Functions used internally by kvm vnode/file routines
+ */
+mode_t	_kvm_getftype(enum vtype);
+int	_kvm_stat_cd9660(kvm_t *, struct kinfo_file *, struct vnode *);
+int	_kvm_stat_udf(kvm_t *, struct kinfo_file *, struct vnode *);
+int	_kvm_stat_ntfs(kvm_t *, struct kinfo_file *, struct vnode *);
diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 7e73671a848..799dbe20968 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_file2.c,v 1.30 2013/11/12 14:49:41 guenther Exp $	*/
+/*	$OpenBSD: kvm_file2.c,v 1.31 2013/11/16 00:37:11 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -114,6 +114,7 @@
 #include <unistd.h>
 
 #include "kvm_private.h"
+#include "kvm_file.h"
 
 static struct kinfo_file *kvm_deadfile_byfile(kvm_t *, int, int,
     size_t, int *);
@@ -123,8 +124,6 @@ static int fill_file(kvm_t *, struct kinfo_file *, struct file *, u_long,
     struct vnode *, struct proc *, int, pid_t);
 static int filestat(kvm_t *, struct kinfo_file *, struct vnode *);
 
-mode_t	_kvm_getftype(enum vtype v_type);
-
 LIST_HEAD(proclist, proc);
 
 struct kinfo_file *
diff --git a/lib/libkvm/kvm_ntfs.c b/lib/libkvm/kvm_ntfs.c
index f8530771ec0..90ebb43d4f9 100644
--- a/lib/libkvm/kvm_ntfs.c
+++ b/lib/libkvm/kvm_ntfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_ntfs.c,v 1.3 2013/10/22 16:40:27 guenther Exp $	*/
+/*	$OpenBSD: kvm_ntfs.c,v 1.4 2013/11/16 00:37:11 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,8 +45,7 @@
 #include <db.h>
 
 #include "kvm_private.h"
-
-extern mode_t _kvm_getftype(enum vtype);
+#include "kvm_file.h"
 
 int
 _kvm_stat_ntfs(kvm_t *kd, struct kinfo_file *kf, struct vnode *vp)
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index e6718659f28..c1f8c6ee982 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_private.h,v 1.19 2013/11/12 14:49:41 guenther Exp $ */
+/*	$OpenBSD: kvm_private.h,v 1.20 2013/11/16 00:37:11 guenther Exp $ */
 /*	$NetBSD: kvm_private.h,v 1.7 1996/05/05 04:32:15 gwr Exp $	*/
 
 /*-
@@ -102,6 +102,3 @@ void	*_kvm_realloc(kvm_t *kd, void *, size_t);
 void	 _kvm_syserr(kvm_t *kd, const char *program, const char *fmt, ...);
 ssize_t	 _kvm_pread(kvm_t *, int, void *, size_t, off_t);
 ssize_t	 _kvm_pwrite(kvm_t *, int, const void *, size_t, off_t);
-int	 _kvm_stat_cd9660(kvm_t *, struct kinfo_file *, struct vnode *);
-int	 _kvm_stat_udf(kvm_t *, struct kinfo_file *, struct vnode *);
-int	 _kvm_stat_ntfs(kvm_t *, struct kinfo_file *, struct vnode *);
diff --git a/lib/libkvm/kvm_udf.c b/lib/libkvm/kvm_udf.c
index 3907ebc5c13..94ce9b9c427 100644
--- a/lib/libkvm/kvm_udf.c
+++ b/lib/libkvm/kvm_udf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_udf.c,v 1.6 2013/10/22 16:40:27 guenther Exp $	*/
+/*	$OpenBSD: kvm_udf.c,v 1.7 2013/11/16 00:37:11 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -44,6 +44,7 @@
 #include <db.h>
 
 #include "kvm_private.h"
+#include "kvm_file.h"
 
 /* Convert file entry permission (5 bits per owner/group/user) to a mode_t */
 static mode_t