diff options
| -rw-r--r-- | sbin/nfsiod/nfsiod.c | 6 | ||||
| -rw-r--r-- | sbin/nos-tun/nos-tun.c | 2 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 61 | ||||
| -rw-r--r-- | sbin/quotacheck/quotacheck.c | 32 | ||||
| -rw-r--r-- | sbin/route/route.c | 6 | ||||
| -rw-r--r-- | sbin/routed/radix.h | 54 | ||||
| -rw-r--r-- | sbin/savecore/savecore.c | 32 | ||||
| -rw-r--r-- | sbin/shutdown/shutdown.c | 18 | ||||
| -rw-r--r-- | sbin/slattach/slattach.c | 2 | ||||
| -rw-r--r-- | sbin/startslip/startslip.c | 8 | ||||
| -rw-r--r-- | sbin/swapon/swapon.c | 4 | ||||
| -rw-r--r-- | sbin/sysctl/pathconf.c | 8 | ||||
| -rw-r--r-- | sbin/tunefs/tunefs.c | 12 |
13 files changed, 122 insertions, 123 deletions
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c index 65ded35..1b55d85 100644 --- a/sbin/nfsiod/nfsiod.c +++ b/sbin/nfsiod/nfsiod.c @@ -69,9 +69,9 @@ int debug = 1; int debug = 0; #endif -void nonfs __P((int)); -void reapchild __P((int)); -void usage __P((void)); +void nonfs(int); +void reapchild(int); +void usage(void); /* * Nfsiod does asynchronous buffered I/O on behalf of the NFS client. diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c index 38678fa..f27ddd6 100644 --- a/sbin/nos-tun/nos-tun.c +++ b/sbin/nos-tun/nos-tun.c @@ -84,7 +84,7 @@ static struct ifreq ifrq; int net; /* socket descriptor */ int tun; /* tunnel descriptor */ -static void usage __P((void)); +static void usage(void); int Set_address(char *addr, struct sockaddr_in *sin) { diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 9132146..5ffc91a 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -252,37 +252,36 @@ volatile sig_atomic_t seenint; volatile sig_atomic_t seeninfo; #endif -int main __P((int, char *[])); -void fill __P((char *, char *)); -int get_hoplim __P((struct msghdr *)); -int get_pathmtu __P((struct msghdr *)); -void set_pathmtu __P((int)); -struct in6_pktinfo *get_rcvpktinfo __P((struct msghdr *)); -void onsignal __P((int)); -void retransmit __P((void)); -void onint __P((int)); -size_t pingerlen __P((void)); -int pinger __P((void)); -const char *pr_addr __P((struct sockaddr *, int)); -void pr_icmph __P((struct icmp6_hdr *, u_char *)); -void pr_iph __P((struct ip6_hdr *)); -void pr_suptypes __P((struct icmp6_nodeinfo *, size_t)); -void pr_nodeaddr __P((struct icmp6_nodeinfo *, int)); -int myechoreply __P((const struct icmp6_hdr *)); -int mynireply __P((const struct icmp6_nodeinfo *)); -char *dnsdecode __P((const u_char **, const u_char *, const u_char *, - u_char *, size_t)); -void pr_pack __P((u_char *, int, struct msghdr *)); -void pr_exthdrs __P((struct msghdr *)); -void pr_ip6opt __P((void *)); -void pr_rthdr __P((void *)); -int pr_bitrange __P((u_int32_t, int, int)); -void pr_retip __P((struct ip6_hdr *, u_char *)); -void summary __P((void)); -void tvsub __P((struct timeval *, struct timeval *)); -int setpolicy __P((int, char *)); -char *nigroup __P((char *)); -void usage __P((void)); +void fill(char *, char *); +int get_hoplim(struct msghdr *); +int get_pathmtu(struct msghdr *); +void set_pathmtu(int); +struct in6_pktinfo *get_rcvpktinfo(struct msghdr *); +void onsignal(int); +void retransmit(void); +void onint(int); +size_t pingerlen(void); +int pinger(void); +const char *pr_addr(struct sockaddr *, int); +void pr_icmph(struct icmp6_hdr *, u_char *); +void pr_iph(struct ip6_hdr *); +void pr_suptypes(struct icmp6_nodeinfo *, size_t); +void pr_nodeaddr(struct icmp6_nodeinfo *, int); +int myechoreply(const struct icmp6_hdr *); +int mynireply(const struct icmp6_nodeinfo *); +char *dnsdecode(const u_char **, const u_char *, const u_char *, + u_char *, size_t); +void pr_pack(u_char *, int, struct msghdr *); +void pr_exthdrs(struct msghdr *); +void pr_ip6opt(void *); +void pr_rthdr(void *); +int pr_bitrange(u_int32_t, int, int); +void pr_retip(struct ip6_hdr *, u_char *); +void summary(void); +void tvsub(struct timeval *, struct timeval *); +int setpolicy(int, char *); +char *nigroup(char *); +void usage(void); int main(argc, argv) diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 567d4c3..ca8f96b 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -108,24 +108,24 @@ int fi; /* open disk file descriptor */ u_long highid[MAXQUOTAS]; /* highest addid()'ed identifier per type */ struct fileusage * - addid __P((u_long, int, char *)); -char *blockcheck __P((char *)); -void bread __P((daddr_t, char *, long)); -extern int checkfstab __P((int, int, void * (*)(struct fstab *), - int (*)(char *, char *, struct quotaname *))); -int chkquota __P((char *, char *, struct quotaname *)); -void freeinodebuf __P((void)); + addid(u_long, int, char *); +char *blockcheck(char *); +void bread(daddr_t, char *, long); +extern int checkfstab(int, int, void * (*)(struct fstab *), + int (*)(char *, char *, struct quotaname *)); +int chkquota(char *, char *, struct quotaname *); +void freeinodebuf(void); struct dinode * - getnextinode __P((ino_t)); -int getquotagid __P((void)); -int hasquota __P((struct fstab *, int, char **)); + getnextinode(ino_t); +int getquotagid(void); +int hasquota(struct fstab *, int, char **); struct fileusage * - lookup __P((u_long, int)); -void *needchk __P((struct fstab *)); -int oneof __P((char *, char*[], int)); -void resetinodebuf __P((void)); -int update __P((char *, char *, int)); -void usage __P((void)); + lookup(u_long, int); +void *needchk(struct fstab *); +int oneof(char *, char*[], int); +void resetinodebuf(void); +int update(char *, char *, int); +void usage(void); int main(argc, argv) diff --git a/sbin/route/route.c b/sbin/route/route.c index 9fb5c25..676526f 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -108,8 +108,8 @@ int locking, lockrest, debugonly; struct rt_metrics rt_metrics; u_long rtm_inits; uid_t uid; -int atalk_aton __P((const char *, struct at_addr *)); -char *atalk_ntoa __P((struct at_addr)); +int atalk_aton(const char *, struct at_addr *); +char *atalk_ntoa(struct at_addr); const char *routename(), *netname(); void flushroutes(), newroute(), monitor(), sockaddr(), sodump(), bprintf(); void print_getmsg(), print_rtmsg(), pmsg_common(), pmsg_addrs(), mask_addr(); @@ -117,7 +117,7 @@ int getaddr(), rtmsg(), x25_makemask(); int prefixlen(); extern char *iso_ntoa(); -void usage __P((const char *)) __dead2; +void usage(const char *) __dead2; void usage(cp) diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h index ab3bf62..cf43c6c 100644 --- a/sbin/routed/radix.h +++ b/sbin/routed/radix.h @@ -113,21 +113,21 @@ struct radix_node_head { int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ struct radix_node *(*rnh_addaddr) /* add based on sockaddr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); + (void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); struct radix_node *(*rnh_addpkt) /* add based on packet hdr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); + (void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); struct radix_node *(*rnh_lookup) /* locate based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); int (*rnh_walktree) /* traverse tree */ (struct radix_node_head *head, int (*f)(struct radix_node *, struct walkarg *), @@ -141,25 +141,25 @@ struct radix_node_head { #define Bzero(p, n) memset((void *)(p), 0, (size_t)(n)); #define Free(p) free((void *)p); -void rn_init __P((void)); -int rn_inithead __P((void **, int)); -int rn_refines __P((void *, void *)); -int rn_walktree __P((struct radix_node_head *, - int (*)__P((struct radix_node *, struct walkarg *)), - struct walkarg *)); +void rn_init(void); +int rn_inithead(void **, int); +int rn_refines(void *, void *); +int rn_walktree(struct radix_node_head *, + int (*)(struct radix_node *, struct walkarg *), + struct walkarg *); struct radix_node - *rn_addmask __P((void *, int, int)), - *rn_addroute __P((void *, void *, struct radix_node_head *, - struct radix_node [2])), - *rn_delete __P((void *, void *, struct radix_node_head *)), - *rn_insert __P((void *, struct radix_node_head *, int *, - struct radix_node [2])), - *rn_match __P((void *, struct radix_node_head *)), - *rn_newpair __P((void *, int, struct radix_node[2])), - *rn_search __P((void *, struct radix_node *)), - *rn_search_m __P((void *, struct radix_node *, void *)); - -struct radix_node *rn_lookup __P((void *, void *, struct radix_node_head *)); + *rn_addmask(void *, int, int), + *rn_addroute(void *, void *, struct radix_node_head *, + struct radix_node [2]), + *rn_delete(void *, void *, struct radix_node_head *), + *rn_insert(void *, struct radix_node_head *, int *, + struct radix_node [2]), + *rn_match(void *, struct radix_node_head *), + *rn_newpair(void *, int, struct radix_node[2]), + *rn_search(void *, struct radix_node *), + *rn_search_m(void *, struct radix_node *, void *); + +struct radix_node *rn_lookup(void *, void *, struct radix_node_head *); #endif /* __RADIX_H_ */ diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index fb98316..9bde146 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -129,22 +129,22 @@ u_long kernbase; /* offset of kvm to core file */ int clear, compress, force, verbose; /* flags */ int keep; /* keep dump on device */ -void check_kmem __P((void)); -int check_space __P((void)); -void clear_dump __P((void)); -void DumpRead __P((int fd, void *bp, int size, off_t off, int flag)); -void DumpWrite __P((int fd, void *bp, int size, off_t off, int flag)); -int dump_exists __P((void)); -void find_dev __P((dev_t)); -int get_crashtime __P((void)); -void get_dumpsize __P((void)); -void kmem_setup __P((void)); -void Lseek __P((int, off_t, int)); -int Open __P((const char *, int rw)); -int Read __P((int, void *, int)); -void save_core __P((void)); -void usage __P((void)); -void Write __P((int, void *, int)); +void check_kmem(void); +int check_space(void); +void clear_dump(void); +void DumpRead(int fd, void *bp, int size, off_t off, int flag); +void DumpWrite(int fd, void *bp, int size, off_t off, int flag); +int dump_exists(void); +void find_dev(dev_t); +int get_crashtime(void); +void get_dumpsize(void); +void kmem_setup(void); +void Lseek(int, off_t, int); +int Open(const char *, int rw); +int Read(int, void *, int); +void save_core(void); +void usage(void); +void Write(int, void *, int); int main(argc, argv) diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 0fe703f..23aae0c 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -97,15 +97,15 @@ static int dohalt, dopower, doreboot, killflg, mbuflen, oflag; static char mbuf[BUFSIZ]; static const char *nosync, *whom; -void badtime __P((void)); -void die_you_gravy_sucking_pig_dog __P((void)); -void finish __P((int)); -void getoffset __P((char *)); -void loop __P((void)); -void nolog __P((void)); -void timeout __P((int)); -void timewarn __P((int)); -void usage __P((const char *)); +void badtime(void); +void die_you_gravy_sucking_pig_dog(void); +void finish(int); +void getoffset(char *); +void loop(void); +void nolog(void); +void timeout(int); +void timewarn(int); +void usage(const char *); int main(argc, argv) diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index ba599ba..96a962f 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -78,7 +78,7 @@ void setup_line(int cflag); /* configure terminal settings */ void slip_discipline(); /* switch to slip line discipline */ void configure_network(); /* configure slip interface */ void acquire_line(); /* get tty device as controlling terminal */ -static void usage __P((void)); +static void usage(void); int fd = -1; char *dev = (char *)0; /* path name of the tty (e.g. /dev/tty01) */ diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index c647942..f949a5f 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -104,10 +104,10 @@ int debug = 0; #endif #define printd if (debug) printf -int carrier __P((void)); -void down __P((int)); -int getline __P((char *, int, int, time_t)); -static void usage __P((void)); +int carrier(void); +void down(int); +int getline(char *, int, int, time_t); +static void usage(void); int main(argc, argv) diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 323049b..69f4e73 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -53,8 +53,8 @@ static const char rcsid[] = #include <string.h> #include <unistd.h> -static void usage __P((void)); -int add __P((char *name, int ignoreebusy)); +static void usage(void); +int add(char *name, int ignoreebusy); int main(int argc, char **argv) diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c index 73777e3..ed62a78 100644 --- a/sbin/sysctl/pathconf.c +++ b/sbin/sysctl/pathconf.c @@ -81,10 +81,10 @@ struct list pclist = { pcnames, PC_MAXID }; int Aflag, aflag, nflag, wflag, stdinflag; -int findname __P((char *, char *, char**, struct list *)); -void listall __P((char *, struct list *)); -void parse __P((char *, char *, int)); -static void usage __P((void)); +int findname(char *, char *, char**, struct list *); +void listall(char *, struct list *); +void parse(char *, char *, int); +static void usage(void); int main(argc, argv) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 7861fd3..f8d7223 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -76,12 +76,12 @@ union { int fi; long dev_bsize = 1; -void bwrite __P((daddr_t, const char *, int)); -int bread __P((daddr_t, char *, int)); -void getsb __P((struct fs *, const char *)); -void putsb __P((struct fs *, const char *, int)); -void usage __P((void)); -void printfs __P((void)); +void bwrite(daddr_t, const char *, int); +int bread(daddr_t, char *, int); +void getsb(struct fs *, const char *); +void putsb(struct fs *, const char *, int); +void usage(void); +void printfs(void); int main(argc, argv) |
