From 4952afaa4ffb11716c76871730cfdd704347af28 Mon Sep 17 00:00:00 2001 From: enami Date: Wed, 1 Nov 2000 04:10:02 +0000 Subject: [PATCH] Factor out some function declarations into a header file. --- sbin/mount/mount.c | 8 +++----- sbin/mount/vfslist.c | 8 ++++---- sbin/mount/vfslist.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 sbin/mount/vfslist.h diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index b60bc68c1a83..21d0c7718a6d 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount.c,v 1.54 2000/11/01 04:06:49 enami Exp $ */ +/* $NetBSD: mount.c,v 1.55 2000/11/01 04:10:02 enami Exp $ */ /* * Copyright (c) 1980, 1989, 1993, 1994 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #else -__RCSID("$NetBSD: mount.c,v 1.54 2000/11/01 04:06:49 enami Exp $"); +__RCSID("$NetBSD: mount.c,v 1.55 2000/11/01 04:10:02 enami Exp $"); #endif #endif /* not lint */ @@ -67,6 +67,7 @@ __RCSID("$NetBSD: mount.c,v 1.54 2000/11/01 04:06:49 enami Exp $"); #include #include "pathnames.h" +#include "vfslist.h" static int debug, verbose; @@ -83,10 +84,7 @@ static void prmount __P((struct statfs *)); static void usage __P((void)); void checkname __P((int, char *[])); -int checkvfsname __P((const char *, const char **)); int main __P((int, char *[])); -const char ** - makevfslist __P((char *)); /* Map from mount otions to printable formats. */ static const struct opt { diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c index b91da177a9da..f93258836537 100644 --- a/sbin/mount/vfslist.c +++ b/sbin/mount/vfslist.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfslist.c,v 1.2 1997/09/16 12:22:47 lukem Exp $ */ +/* $NetBSD: vfslist.c,v 1.3 2000/11/01 04:10:02 enami Exp $ */ /* * Copyright (c) 1995 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)vfslist.c 8.1 (Berkeley) 5/8/95"; #else -__RCSID("$NetBSD: vfslist.c,v 1.2 1997/09/16 12:22:47 lukem Exp $"); +__RCSID("$NetBSD: vfslist.c,v 1.3 2000/11/01 04:10:02 enami Exp $"); #endif #endif /* not lint */ @@ -47,8 +47,8 @@ __RCSID("$NetBSD: vfslist.c,v 1.2 1997/09/16 12:22:47 lukem Exp $"); #include #include -int checkvfsname __P((const char *, const char **)); -const char **makevfslist __P((char *)); +#include "vfslist.h" + static int skipvfs; int diff --git a/sbin/mount/vfslist.h b/sbin/mount/vfslist.h new file mode 100644 index 000000000000..1171148a2eaf --- /dev/null +++ b/sbin/mount/vfslist.h @@ -0,0 +1,37 @@ +/* $NetBSD: vfslist.h,v 1.1 2000/11/01 04:10:03 enami Exp $ */ + +/* + * Copyright (c) 1995 + * The Regents of the University of California. All rights reserved. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +int checkvfsname __P((const char *, const char **)); +const char **makevfslist __P((char *));