Kill __P(), use ANSI function declarations; WARNS=3.

This commit is contained in:
xtraeme 2005-02-05 14:47:18 +00:00
parent 23bd8cd383
commit 816b5578c8
8 changed files with 39 additions and 49 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:57 jdolecek Exp $
# $NetBSD: Makefile,v 1.12 2005/02/05 14:47:18 xtraeme Exp $
.include <bsd.own.mk>
@ -6,6 +6,8 @@ PROG= mount_ados
SRCS= mount_ados.c fattr.c
MAN= mount_ados.8
WARNS= 3
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}

View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_ados.c,v 1.18 2005/01/31 05:19:18 erh Exp $ */
/* $NetBSD: mount_ados.c,v 1.19 2005/02/05 14:47:18 xtraeme Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mount_ados.c,v 1.18 2005/01/31 05:19:18 erh Exp $");
__RCSID("$NetBSD: mount_ados.c,v 1.19 2005/02/05 14:47:18 xtraeme Exp $");
#endif /* not lint */
#include <sys/cdefs.h>
@ -64,9 +64,8 @@ static const struct mntopt mopts[] = {
{ NULL }
};
int main __P((int, char *[]));
int mount_ados __P((int argc, char **argv));
static void usage __P((void));
int mount_ados(int argc, char **argv);
static void usage(void);
#ifndef MOUNT_NOMAIN
int
@ -77,9 +76,7 @@ main(int argc, char **argv)
#endif
int
mount_ados(argc, argv)
int argc;
char **argv;
mount_ados(int argc, char **argv)
{
struct adosfs_args args;
struct stat sb;
@ -173,7 +170,7 @@ mount_ados(argc, argv)
}
static void
usage()
usage(void)
{
fprintf(stderr, "usage: mount_ados [-o options] [-u user] [-g group] [-m mask] bdev dir\n");

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2003/03/22 12:43:58 jdolecek Exp $
# $NetBSD: Makefile,v 1.10 2005/02/05 14:49:36 xtraeme Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
@ -7,6 +7,8 @@ PROG= mount_cd9660
SRCS= mount_cd9660.c
MAN= mount_cd9660.8
WARNS= 3
MOUNT= ${NETBSDSRCDIR}/sbin/mount
DPADD+=${LIBUTIL}

View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_cd9660.c,v 1.19 2005/01/31 05:19:19 erh Exp $ */
/* $NetBSD: mount_cd9660.c,v 1.20 2005/02/05 14:49:36 xtraeme Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95";
#else
__RCSID("$NetBSD: mount_cd9660.c,v 1.19 2005/01/31 05:19:19 erh Exp $");
__RCSID("$NetBSD: mount_cd9660.c,v 1.20 2005/02/05 14:49:36 xtraeme Exp $");
#endif
#endif /* not lint */
@ -78,24 +78,19 @@ static const struct mntopt mopts[] = {
{ NULL }
};
int main __P((int, char *[]));
int mount_cd9660 __P((int argc, char **argv));
static void usage __P((void));
int mount_cd9660(int argc, char **argv);
static void usage(void);
#ifndef MOUNT_NOMAIN
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
return mount_cd9660(argc, argv);
}
#endif
int
mount_cd9660(argc, argv)
int argc;
char **argv;
mount_cd9660(int argc, char **argv)
{
struct iso_args args;
int ch, mntflags, opts;
@ -177,7 +172,7 @@ mount_cd9660(argc, argv)
}
static void
usage()
usage(void)
{
(void)fprintf(stderr,
"usage: mount_cd9660 [-o options] special node\n");

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2003/03/22 12:43:58 jdolecek Exp $
# $NetBSD: Makefile,v 1.6 2005/02/05 14:51:16 xtraeme Exp $
#
# $OpenBSD: Makefile,v 1.1 1996/06/27 07:20:28 downsj Exp $
@ -8,6 +8,8 @@ PROG= mount_ext2fs
SRCS= mount_ext2fs.c
MAN= mount_ext2fs.8
WARNS= 3
DPADD+=${LIBUTIL}
LDADD+=-lutil

View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_ext2fs.c,v 1.12 2005/01/31 05:19:19 erh Exp $ */
/* $NetBSD: mount_ext2fs.c,v 1.13 2005/02/05 14:51:16 xtraeme Exp $ */
/*-
* Copyright (c) 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
#else
__RCSID("$NetBSD: mount_ext2fs.c,v 1.12 2005/01/31 05:19:19 erh Exp $");
__RCSID("$NetBSD: mount_ext2fs.c,v 1.13 2005/02/05 14:51:16 xtraeme Exp $");
#endif
#endif /* not lint */
@ -57,9 +57,8 @@ __RCSID("$NetBSD: mount_ext2fs.c,v 1.12 2005/01/31 05:19:19 erh Exp $");
#include <mntopts.h>
static void ext2fs_usage __P((void));
int main __P((int, char *[]));
int mount_ext2fs __P((int argc, char **argv));
static void ext2fs_usage(void);
int mount_ext2fs(int argc, char **argv);
static const struct mntopt mopts[] = {
MOPT_STDOPTS,
@ -75,18 +74,14 @@ static const struct mntopt mopts[] = {
#ifndef MOUNT_NOMAIN
int
main(argc, argv)
int argc;
char *argv[];
main(int argc, char *argv[])
{
return mount_ext2fs(argc, argv);
}
#endif
int
mount_ext2fs(argc, argv)
int argc;
char *argv[];
mount_ext2fs(int argc, char *argv[])
{
struct ufs_args args; /* XXX ffs_args */
int ch, mntflags;
@ -154,7 +149,7 @@ mount_ext2fs(argc, argv)
}
static void
ext2fs_usage()
ext2fs_usage(void)
{
(void)fprintf(stderr,
"usage: mount_ext2fs [-o options] special node\n");

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:58 jdolecek Exp $
# $NetBSD: Makefile,v 1.12 2005/02/05 14:53:03 xtraeme Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
@ -7,6 +7,8 @@ PROG= mount_fdesc
SRCS= mount_fdesc.c
MAN= mount_fdesc.8
WARNS= 3
DPADD+=${LIBUTIL}
LDADD+=-lutil

View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_fdesc.c,v 1.15 2005/01/31 05:19:19 erh Exp $ */
/* $NetBSD: mount_fdesc.c,v 1.16 2005/02/05 14:53:03 xtraeme Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount_fdesc.c 8.3 (Berkeley) 4/26/95";
#else
__RCSID("$NetBSD: mount_fdesc.c,v 1.15 2005/01/31 05:19:19 erh Exp $");
__RCSID("$NetBSD: mount_fdesc.c,v 1.16 2005/02/05 14:53:03 xtraeme Exp $");
#endif
#endif /* not lint */
@ -98,24 +98,19 @@ static const struct mntopt mopts[] = {
{ NULL }
};
static void usage __P((void));
int main __P((int, char *[]));
int mount_fdesc __P((int argc, char **argv));
static void usage(void);
int mount_fdesc(int argc, char **argv);
#ifndef MOUNT_NOMAIN
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
return mount_fdesc(argc, argv);
}
#endif
int
mount_fdesc(argc, argv)
int argc;
char *argv[];
mount_fdesc(int argc, char *argv[])
{
int ch, mntflags;
char canon_dir[MAXPATHLEN];
@ -149,7 +144,7 @@ mount_fdesc(argc, argv)
}
static void
usage()
usage(void)
{
(void)fprintf(stderr,
"usage: mount_fdesc [-o options] fdesc mount_point\n");