aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2002-03-21 13:14:21 +0000
committerWarner Losh <imp@FreeBSD.org>2002-03-21 13:14:21 +0000
commit854299908ccfad3f3d42b5b24443e15bbc03471c (patch)
treecf03a665e09244d20cbc38b337d5cd22ba2bfd30 /sbin
parent0638cc1a3950101932c23ee84e49ec09b9ffc92e (diff)
downloadsrc-854299908ccfad3f3d42b5b24443e15bbc03471c.tar.gz
src-854299908ccfad3f3d42b5b24443e15bbc03471c.zip
o __P removed
o main prototype removed
Notes
Notes: svn path=/head/; revision=92882
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ldconfig/ldconfig.c14
-rw-r--r--sbin/ldconfig/ldconfig.h4
-rw-r--r--sbin/mount/extern.h6
-rw-r--r--sbin/mount/mntopts.h6
-rw-r--r--sbin/mount/mount.c29
-rw-r--r--sbin/mount/mount_ufs.c2
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c2
-rw-r--r--sbin/mount_hpfs/mount_hpfs.c10
-rw-r--r--sbin/mount_ifs/extern.h2
-rw-r--r--sbin/mount_ifs/mount.c28
-rw-r--r--sbin/mount_ifs/mount_ufs.c2
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c12
-rw-r--r--sbin/mount_nfs/mount_nfs.c10
-rw-r--r--sbin/mount_ntfs/mount_ntfs.c10
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c4
-rw-r--r--sbin/mount_portalfs/mount_portalfs.c2
-rw-r--r--sbin/mount_portalfs/portald.h26
-rw-r--r--sbin/mount_std/mount_std.c2
-rw-r--r--sbin/mount_umapfs/mount_umapfs.c2
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c4
-rw-r--r--sbin/mountd/mountd.c82
21 files changed, 129 insertions, 130 deletions
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index b63a79c4db15..eab4797f164c 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -87,13 +87,13 @@ struct shlib_list {
static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head;
static char *dir_list;
-static int buildhints __P((void));
-static int dodir __P((char *, int));
-int dofile __P((char *, int));
-static void enter __P((char *, char *, char *, int *, int));
-static void listhints __P((void));
-static int readhints __P((void));
-static void usage __P((void));
+static int buildhints(void);
+static int dodir(char *, int);
+int dofile(char *, int);
+static void enter(char *, char *, char *, int *, int);
+static void listhints(void);
+static int readhints(void);
+static void usage(void);
int
main(argc, argv)
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 2a1e4265ef9a..859bcbd204bc 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -34,8 +34,8 @@
extern int insecure; /* -i flag, needed here for elfhints.c */
__BEGIN_DECLS
-void list_elf_hints __P((const char *));
-void update_elf_hints __P((const char *, int, char **, int));
+void list_elf_hints(const char *);
+void update_elf_hints(const char *, int, char **, int);
__END_DECLS
#endif
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index bc11a037ecfd..638f8a4a1eb2 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -27,8 +27,8 @@
*/
/* vfslist.c */
-int checkvfsname __P((const char *, const char **));
-const char **makevfslist __P((char *));
+int checkvfsname(const char *, const char **);
+const char **makevfslist(char *);
/* mount_ufs.c */
-int mount_ufs __P((int, char *const *));
+int mount_ufs(int, char *const *);
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index a30a707306e8..8ff13f7940ac 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -88,7 +88,7 @@ struct mntopt {
MOPT_NOCLUSTERR, \
MOPT_NOCLUSTERW
-void getmntopts __P((const char *, const struct mntopt *, int *, int *));
-void rmslashes __P((char *, char *));
-void checkpath __P((const char *, char resolved_path[]));
+void getmntopts(const char *, const struct mntopt *, int *, int *);
+void rmslashes(char *, char *);
+void checkpath(const char *, char resolved_path[]);
extern int getmnt_silent;
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 9648eaaad2fb..3494d9cd0269 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -70,21 +70,20 @@ static const char rcsid[] =
int debug, fstab_style, verbose;
-char *catopt __P((char *, const char *));
-struct statfs
- *getmntpt __P((const char *));
-int hasopt __P((const char *, const char *));
-int ismounted __P((struct fstab *, struct statfs *, int));
-int isremountable __P((const char *));
-void mangle __P((char *, int *, const char **));
-char *update_options __P((char *, char *, int));
-int mountfs __P((const char *, const char *, const char *,
- int, const char *, const char *));
-void remopt __P((char *, const char *));
-void prmount __P((struct statfs *));
-void putfsent __P((const struct statfs *));
-void usage __P((void));
-char *flags2opts __P((int));
+char *catopt(char *, const char *);
+struct statfs *getmntpt(const char *);
+int hasopt(const char *, const char *);
+int ismounted(struct fstab *, struct statfs *, int);
+int isremountable(const char *);
+void mangle(char *, int *, const char **);
+char *update_options(char *, char *, int);
+int mountfs(const char *, const char *, const char *,
+ int, const char *, const char *);
+void remopt(char *, const char *);
+void prmount(struct statfs *);
+void putfsent(const struct statfs *);
+void usage(void);
+char *flags2opts(int);
/* Map from mount options to printable formats. */
static struct opt {
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 8c626dbf8280..dee0ddf5db88 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
#include "extern.h"
#include "mntopts.h"
-static void ufs_usage __P((void));
+static void ufs_usage(void);
static struct mntopt mopts[] = {
MOPT_STDOPTS,
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index ded01952a936..acb9c9d3bdc0 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -67,7 +67,7 @@ struct mntopt mopts[] = {
{ NULL }
};
-static void usage __P((void)) __dead2;
+static void usage(void) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index 8ddf5bd56d9f..1b360cbfd950 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -53,11 +53,11 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static gid_t a_gid __P((char *));
-static uid_t a_uid __P((char *));
-static mode_t a_mask __P((char *));
-static void usage __P((void)) __dead2;
-static void load_u2wtable __P((struct hpfs_args *, char *));
+static gid_t a_gid(char *);
+static uid_t a_uid(char *);
+static mode_t a_mask(char *);
+static void usage(void) __dead2;
+static void load_u2wtable(struct hpfs_args *, char *);
int
main(argc, argv)
diff --git a/sbin/mount_ifs/extern.h b/sbin/mount_ifs/extern.h
index 9306b4fc2b37..40f822b08435 100644
--- a/sbin/mount_ifs/extern.h
+++ b/sbin/mount_ifs/extern.h
@@ -27,4 +27,4 @@
*/
/* mount_ufs.c */
-int mount_ifs __P((int, char *const *));
+int mount_ifs(int, char *const *);
diff --git a/sbin/mount_ifs/mount.c b/sbin/mount_ifs/mount.c
index 40a36f5c1293..7264a39208b7 100644
--- a/sbin/mount_ifs/mount.c
+++ b/sbin/mount_ifs/mount.c
@@ -70,21 +70,21 @@ static const char rcsid[] =
int debug, fstab_style, verbose;
-char *catopt __P((char *, const char *));
+char *catopt(char *, const char *);
struct statfs
- *getmntpt __P((const char *));
-int hasopt __P((const char *, const char *));
-int ismounted __P((struct fstab *, struct statfs *, int));
-int isremountable __P((const char *));
-void mangle __P((char *, int *, const char **));
-char *update_options __P((char *, char *, int));
-int mountfs __P((const char *, const char *, const char *,
- int, const char *, const char *));
-void remopt __P((char *, const char *));
-void prmount __P((struct statfs *));
-void putfsent __P((const struct statfs *));
-void usage __P((void));
-char *flags2opts __P((int));
+ *getmntpt(const char *);
+int hasopt(const char *, const char *);
+int ismounted(struct fstab *, struct statfs *, int);
+int isremountable(const char *);
+void mangle(char *, int *, const char **);
+char *update_options(char *, char *, int);
+int mountfs(const char *, const char *, const char *,
+ int, const char *, const char *);
+void remopt(char *, const char *);
+void prmount(struct statfs *);
+void putfsent(const struct statfs *);
+void usage(void);
+char *flags2opts(int);
/* Map from mount options to printable formats. */
static struct opt {
diff --git a/sbin/mount_ifs/mount_ufs.c b/sbin/mount_ifs/mount_ufs.c
index 4f1f9ee63418..254aaecc3817 100644
--- a/sbin/mount_ifs/mount_ufs.c
+++ b/sbin/mount_ifs/mount_ufs.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
#include "extern.h"
#include "mntopts.h"
-static void ifs_usage __P((void));
+static void ifs_usage(void);
static struct mntopt mopts[] = {
MOPT_STDOPTS,
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index a74676be89cb..b70b5b1ff9c1 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -74,12 +74,12 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static gid_t a_gid __P((char *));
-static uid_t a_uid __P((char *));
-static mode_t a_mask __P((char *));
-static void usage __P((void)) __dead2;
-static void load_u2wtable __P((struct msdosfs_args *, char *));
-static void load_ultable __P((struct msdosfs_args *, char *));
+static gid_t a_gid(char *);
+static uid_t a_uid(char *);
+static mode_t a_mask(char *);
+static void usage(void) __dead2;
+static void load_u2wtable(struct msdosfs_args *, char *);
+static void load_ultable(struct msdosfs_args *, char *);
int
main(argc, argv)
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index cac54942d97e..ea746a7c4428 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -190,13 +190,13 @@ enum tryret {
TRYRET_LOCALERR /* Local failure. */
};
-int getnfsargs __P((char *, struct nfs_args *));
-/* void set_rpc_maxgrouplist __P((int)); */
+int getnfsargs(char *, struct nfs_args *);
+/* void set_rpc_maxgrouplist(int); */
struct netconfig *getnetconf_cached(const char *netid);
char *netidbytype(int af, int sotype);
-void usage __P((void)) __dead2;
-int xdr_dir __P((XDR *, char *));
-int xdr_fh __P((XDR *, struct nfhret *));
+void usage(void) __dead2;
+int xdr_dir(XDR *, char *);
+int xdr_fh(XDR *, struct nfhret *);
enum tryret nfs_tryproto(struct nfs_args *nfsargsp, struct addrinfo *ai,
char *hostp, char *spec, char **errstr);
enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr);
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 81e137699a69..5269b867a376 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -56,12 +56,12 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static gid_t a_gid __P((char *));
-static uid_t a_uid __P((char *));
-static mode_t a_mask __P((char *));
-static void usage __P((void)) __dead2;
+static gid_t a_gid(char *);
+static uid_t a_uid(char *);
+static mode_t a_mask(char *);
+static void usage(void) __dead2;
-static void load_u2wtable __P((struct ntfs_args *, char *));
+static void load_u2wtable(struct ntfs_args *, char *);
int
main(argc, argv)
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index a5bcd732fe98..31f2d96bbfd5 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -66,8 +66,8 @@ struct mntopt mopts[] = {
{ NULL }
};
-int subdir __P((const char *, const char *));
-static void usage __P((void)) __dead2;
+int subdir(const char *, const char *);
+static void usage(void) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index 4657be38c598..c07eed99f527 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -73,7 +73,7 @@ struct mntopt mopts[] = {
{ NULL }
};
-static void usage __P((void)) __dead2;
+static void usage(void) __dead2;
static sig_atomic_t readcf; /* Set when SIGHUP received */
diff --git a/sbin/mount_portalfs/portald.h b/sbin/mount_portalfs/portald.h
index 5837bd7fede6..46c6afe17172 100644
--- a/sbin/mount_portalfs/portald.h
+++ b/sbin/mount_portalfs/portald.h
@@ -59,26 +59,26 @@ struct qelem {
typedef struct provider provider;
struct provider {
char *pr_match;
- int (*pr_func) __P((struct portal_cred *,
- char *key, char **v, int so, int *fdp));
+ int (*pr_func)(struct portal_cred *,
+ char *key, char **v, int so, int *fdp);
};
extern provider providers[];
/*
* Portal providers
*/
-extern int portal_exec __P((struct portal_cred *,
- char *key, char **v, int so, int *fdp));
-extern int portal_file __P((struct portal_cred *,
- char *key, char **v, int so, int *fdp));
-extern int portal_tcp __P((struct portal_cred *,
- char *key, char **v, int so, int *fdp));
-extern int portal_tcplisten __P((struct portal_cred *,
- char *key, char **v, int so, int *fdp));
+extern int portal_exec(struct portal_cred *,
+ char *key, char **v, int so, int *fdp);
+extern int portal_file(struct portal_cred *,
+ char *key, char **v, int so, int *fdp);
+extern int portal_tcp(struct portal_cred *,
+ char *key, char **v, int so, int *fdp);
+extern int portal_tcplisten(struct portal_cred *,
+ char *key, char **v, int so, int *fdp);
/*
* Global functions
*/
-extern void activate __P((qelem *q, int so));
-extern char **conf_match __P((qelem *q, char *key));
-extern void conf_read __P((qelem *q, char *conf));
+extern void activate(qelem *q, int so);
+extern char **conf_match(qelem *q, char *key);
+extern void conf_read(qelem *q, char *conf);
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 587698912ad2..0960a5e6a9b9 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -63,7 +63,7 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static void usage __P((void)) __dead2;
+static void usage(void) __dead2;
static const char *fsname;
int
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index 2a7a56e848e7..82e3efb3f183 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -86,7 +86,7 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static void usage __P((void)) __dead2;
+static void usage(void) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index d41262687f47..2472b1515df5 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -68,8 +68,8 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static int subdir __P((const char *, const char *));
-static void usage __P((void)) __dead2;
+static int subdir(const char *, const char *);
+static void usage (void) __dead2;
int
main(argc, argv)
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 00567c096d4e..3061d2f8d183 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -158,53 +158,53 @@ struct fhreturn {
};
/* Global defs */
-char *add_expdir __P((struct dirlist **, char *, int));
-void add_dlist __P((struct dirlist **, struct dirlist *,
- struct grouplist *, int));
-void add_mlist __P((char *, char *));
-int check_dirpath __P((char *));
-int check_options __P((struct dirlist *));
+char *add_expdir(struct dirlist **, char *, int);
+void add_dlist(struct dirlist **, struct dirlist *,
+ struct grouplist *, int);
+void add_mlist(char *, char *);
+int check_dirpath(char *);
+int check_options(struct dirlist *);
int checkmask(struct sockaddr *sa);
-int chk_host __P((struct dirlist *, struct sockaddr *, int *, int *));
+int chk_host(struct dirlist *, struct sockaddr *, int *, int *);
void del_mlist(char *hostp, char *dirp);
-struct dirlist *dirp_search __P((struct dirlist *, char *));
-int do_mount __P((struct exportlist *, struct grouplist *, int,
- struct xucred *, char *, int, struct statfs *));
-int do_opt __P((char **, char **, struct exportlist *, struct grouplist *,
- int *, int *, struct xucred *));
-struct exportlist *ex_search __P((fsid_t *));
-struct exportlist *get_exp __P((void));
-void free_dir __P((struct dirlist *));
-void free_exp __P((struct exportlist *));
-void free_grp __P((struct grouplist *));
-void free_host __P((struct hostlist *));
-void get_exportlist __P((void));
-int get_host __P((char *, struct grouplist *, struct grouplist *));
-struct hostlist *get_ht __P((void));
-int get_line __P((void));
-void get_mountlist __P((void));
-int get_net __P((char *, struct netmsk *, int));
-void getexp_err __P((struct exportlist *, struct grouplist *));
-struct grouplist *get_grp __P((void));
-void hang_dirp __P((struct dirlist *, struct grouplist *,
- struct exportlist *, int));
+struct dirlist *dirp_search(struct dirlist *, char *);
+int do_mount(struct exportlist *, struct grouplist *, int,
+ struct xucred *, char *, int, struct statfs *);
+int do_opt(char **, char **, struct exportlist *, struct grouplist *,
+ int *, int *, struct xucred *);
+struct exportlist *ex_search(fsid_t *);
+struct exportlist *get_exp(void);
+void free_dir(struct dirlist *);
+void free_exp(struct exportlist *);
+void free_grp(struct grouplist *);
+void free_host(struct hostlist *);
+void get_exportlist(void);
+int get_host(char *, struct grouplist *, struct grouplist *);
+struct hostlist *get_ht(void);
+int get_line(void);
+void get_mountlist(void);
+int get_net(char *, struct netmsk *, int);
+void getexp_err(struct exportlist *, struct grouplist *);
+struct grouplist *get_grp(void);
+void hang_dirp(struct dirlist *, struct grouplist *,
+ struct exportlist *, int);
void huphandler(int sig);
int makemask(struct sockaddr_storage *ssp, int bitlen);
-void mntsrv __P((struct svc_req *, SVCXPRT *));
-void nextfield __P((char **, char **));
-void out_of_mem __P((void));
-void parsecred __P((char *, struct xucred *));
-int put_exlist __P((struct dirlist *, XDR *, struct dirlist *, int *));
+void mntsrv(struct svc_req *, SVCXPRT *);
+void nextfield(char **, char **);
+void out_of_mem(void);
+void parsecred(char *, struct xucred *);
+int put_exlist(struct dirlist *, XDR *, struct dirlist *, int *);
void *sa_rawaddr(struct sockaddr *sa, int *nbytes);
int sacmp(struct sockaddr *sa1, struct sockaddr *sa2,
struct sockaddr *samask);
-int scan_tree __P((struct dirlist *, struct sockaddr *));
-static void usage __P((void));
-int xdr_dir __P((XDR *, char *));
-int xdr_explist __P((XDR *, caddr_t));
-int xdr_fhs __P((XDR *, caddr_t));
-int xdr_mlist __P((XDR *, caddr_t));
-void terminate __P((int));
+int scan_tree(struct dirlist *, struct sockaddr *);
+static void usage(void);
+int xdr_dir(XDR *, char *);
+int xdr_explist(XDR *, caddr_t);
+int xdr_fhs(XDR *, caddr_t);
+int xdr_mlist(XDR *, caddr_t);
+void terminate(int);
struct exportlist *exphead;
struct mountlist *mlhead;
@@ -244,7 +244,7 @@ int mountdlockfd;
#ifdef DEBUG
int debug = 1;
-void SYSLOG __P((int, const char *, ...)) __printflike(2, 3);
+void SYSLOG(int, const char *, ...) __printflike(2, 3);
#define syslog SYSLOG
#else
int debug = 0;