diff --git a/sys/lib/libsa/arp.c b/sys/lib/libsa/arp.c index 030890dcf543..8716fd6e1fbb 100644 --- a/sys/lib/libsa/arp.c +++ b/sys/lib/libsa/arp.c @@ -1,4 +1,4 @@ -/* $NetBSD: arp.c,v 1.32 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: arp.c,v 1.33 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -89,8 +89,8 @@ struct arp_list { int arp_num = 1; /* Local forwards */ -static ssize_t arpsend __P((struct iodesc *, void *, size_t)); -static ssize_t arprecv __P((struct iodesc *, void *, size_t, saseconds_t)); +static ssize_t arpsend(struct iodesc *, void *, size_t); +static ssize_t arprecv(struct iodesc *, void *, size_t, saseconds_t); /* Broadcast an ARP packet, asking who has addr on interface d */ u_char * diff --git a/sys/lib/libsa/bootp.c b/sys/lib/libsa/bootp.c index eba8ae000f0f..53f5b774c38c 100644 --- a/sys/lib/libsa/bootp.c +++ b/sys/lib/libsa/bootp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootp.c,v 1.33 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: bootp.c,v 1.34 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -71,11 +71,11 @@ static char vm_cmu[4] = VM_CMU; #endif /* Local forwards */ -static ssize_t bootpsend __P((struct iodesc *, void *, size_t)); -static ssize_t bootprecv __P((struct iodesc *, void *, size_t, saseconds_t)); -static int vend_rfc1048 __P((u_char *, u_int)); +static ssize_t bootpsend(struct iodesc *, void *, size_t); +static ssize_t bootprecv(struct iodesc *, void *, size_t, saseconds_t); +static int vend_rfc1048(u_char *, u_int); #ifdef BOOTP_VEND_CMU -static void vend_cmu __P((u_char *)); +static void vend_cmu(u_char *); #endif #ifdef SUPPORT_DHCP diff --git a/sys/lib/libsa/bootp.h b/sys/lib/libsa/bootp.h index cc37ecaf96b4..50fadcacc880 100644 --- a/sys/lib/libsa/bootp.h +++ b/sys/lib/libsa/bootp.h @@ -1,4 +1,4 @@ -/* $NetBSD: bootp.h,v 1.8 2007/11/24 13:20:53 isaki Exp $ */ +/* $NetBSD: bootp.h,v 1.9 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Bootstrap Protocol (BOOTP). RFC951 and RFC1048. @@ -135,4 +135,4 @@ struct cmu_vend { /* v_flags values */ #define VF_SMASK 1 /* Subnet mask field contains valid data */ -extern void bootp __P((int)); +extern void bootp(int); diff --git a/sys/lib/libsa/bootparam.c b/sys/lib/libsa/bootparam.c index 43a560034924..d1f5b3cf0196 100644 --- a/sys/lib/libsa/bootparam.c +++ b/sys/lib/libsa/bootparam.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootparam.c,v 1.17 2008/03/25 21:23:50 christos Exp $ */ +/* $NetBSD: bootparam.c,v 1.18 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -85,11 +85,11 @@ struct xdr_inaddr { int32_t addr[4]; }; -int xdr_inaddr_encode __P((char **, struct in_addr)); -int xdr_inaddr_decode __P((char **, struct in_addr *)); +int xdr_inaddr_encode(char **, struct in_addr); +int xdr_inaddr_decode(char **, struct in_addr *); -int xdr_string_encode __P((char **, char *, int)); -int xdr_string_decode __P((char **, char *, int *)); +int xdr_string_encode(char **, char *, int); +int xdr_string_decode(char **, char *, int *); /* diff --git a/sys/lib/libsa/cread.c b/sys/lib/libsa/cread.c index efbf233c570f..51daac00c265 100644 --- a/sys/lib/libsa/cread.c +++ b/sys/lib/libsa/cread.c @@ -1,4 +1,4 @@ -/* $NetBSD: cread.c,v 1.21 2008/03/25 21:23:50 christos Exp $ */ +/* $NetBSD: cread.c,v 1.22 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1996 @@ -77,14 +77,14 @@ static struct sd { int compressed; /* 1 if input file is a .gz file */ } *ss[SOPEN_MAX]; -static int get_byte __P((struct sd *)); -static unsigned long getLong __P((struct sd *)); -static void check_header __P((struct sd *)); +static int get_byte(struct sd *); +static unsigned long getLong(struct sd *); +static void check_header(struct sd *); /* XXX - find suitable header file for these: */ -void *zcalloc __P((void *, unsigned int, unsigned int)); -void zcfree __P((void *, void *)); -void zmemcpy __P((unsigned char *, unsigned char *, unsigned int)); +void *zcalloc(void *, unsigned int, unsigned int); +void zcfree(void *, void *); +void zmemcpy(unsigned char *, unsigned char *, unsigned int); /* diff --git a/sys/lib/libsa/dev_net.c b/sys/lib/libsa/dev_net.c index 46bf60867abc..60e2c9ec09c8 100644 --- a/sys/lib/libsa/dev_net.c +++ b/sys/lib/libsa/dev_net.c @@ -1,4 +1,4 @@ -/* $NetBSD: dev_net.c,v 1.23 2008/04/28 20:24:06 martin Exp $ */ +/* $NetBSD: dev_net.c,v 1.24 2009/01/17 14:00:36 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ extern int nfs_root_node[]; /* XXX - get from nfs_mount() */ static int netdev_sock = -1; static int netdev_opens; -static int net_getparams __P((int)); +static int net_getparams(int); /* * Called by devopen after it sets f->f_dev to our devsw entry. diff --git a/sys/lib/libsa/dev_net.h b/sys/lib/libsa/dev_net.h index f8319f2ebd77..c4de3cce4a15 100644 --- a/sys/lib/libsa/dev_net.h +++ b/sys/lib/libsa/dev_net.h @@ -1,9 +1,9 @@ -/* $NetBSD: dev_net.h,v 1.5 2007/10/27 12:21:17 tsutsui Exp $ */ +/* $NetBSD: dev_net.h,v 1.6 2009/01/17 14:00:36 tsutsui Exp $ */ -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); -int net_ioctl __P((struct open_file *, u_long, void *)); -int net_strategy __P((void *, int , daddr_t , size_t, void *, size_t *)); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); +int net_ioctl(struct open_file *, u_long, void *); +int net_strategy(void *, int , daddr_t , size_t, void *, size_t *); #ifdef SUPPORT_BOOTP extern int try_bootp; diff --git a/sys/lib/libsa/iodesc.h b/sys/lib/libsa/iodesc.h index 449856c8f3cd..884651e9c176 100644 --- a/sys/lib/libsa/iodesc.h +++ b/sys/lib/libsa/iodesc.h @@ -1,4 +1,4 @@ -/* $NetBSD: iodesc.h,v 1.8 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: iodesc.h,v 1.9 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1993 Adam Glass @@ -70,8 +70,8 @@ struct iodesc { void *io_netif; }; -struct iodesc *socktodesc __P((int)); -ssize_t netif_get __P((struct iodesc *, void *, size_t, saseconds_t)); -ssize_t netif_put __P((struct iodesc *, void *, size_t)); +struct iodesc *socktodesc(int); +ssize_t netif_get(struct iodesc *, void *, size_t, saseconds_t); +ssize_t netif_put(struct iodesc *, void *, size_t); #endif /* __SYS_LIBNETBOOT_IODESC_H */ diff --git a/sys/lib/libsa/net.h b/sys/lib/libsa/net.h index 239ffeabf703..12a7ecc85fde 100644 --- a/sys/lib/libsa/net.h +++ b/sys/lib/libsa/net.h @@ -1,4 +1,4 @@ -/* $NetBSD: net.h,v 1.23 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: net.h,v 1.24 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1993 Adam Glass @@ -90,25 +90,23 @@ extern n_long netmask; extern int debug; /* defined in the machdep sources */ /* ARP/RevARP functions: */ -u_char *arpwhohas __P((struct iodesc *, struct in_addr)); -void arp_reply __P((struct iodesc *, void *)); -int rarp_getipaddress __P((int)); +u_char *arpwhohas(struct iodesc *, struct in_addr); +void arp_reply(struct iodesc *, void *); +int rarp_getipaddress(int); /* Link functions: */ -ssize_t sendether __P((struct iodesc *, void *, size_t, u_char *, int)); -ssize_t readether __P((struct iodesc *, void *, size_t, saseconds_t, u_int16_t *)); +ssize_t sendether(struct iodesc *, void *, size_t, u_char *, int); +ssize_t readether(struct iodesc *, void *, size_t, saseconds_t, u_int16_t *); -ssize_t sendudp __P((struct iodesc *, void *, size_t)); -ssize_t readudp __P((struct iodesc *, void *, size_t, saseconds_t)); -ssize_t sendrecv __P((struct iodesc *, - ssize_t (*)(struct iodesc *, void *, size_t), - void *, size_t, - ssize_t (*)(struct iodesc *, void *, size_t, saseconds_t), - void *, size_t)); +ssize_t sendudp(struct iodesc *, void *, size_t); +ssize_t readudp(struct iodesc *, void *, size_t, saseconds_t); +ssize_t sendrecv(struct iodesc *, ssize_t (*)(struct iodesc *, void *, size_t), + void *, size_t, ssize_t (*)(struct iodesc *, void *, size_t, saseconds_t), + void *, size_t); /* Utilities: */ -char *ether_sprintf __P((const u_char *)); -int ip_cksum __P((const void *, size_t)); +char *ether_sprintf(const u_char *); +int ip_cksum(const void *, size_t); /* Machine-dependent functions: */ -satime_t getsecs __P((void)); +satime_t getsecs(void); diff --git a/sys/lib/libsa/netif.c b/sys/lib/libsa/netif.c index f6bb44f28b16..ada3136629ad 100644 --- a/sys/lib/libsa/netif.c +++ b/sys/lib/libsa/netif.c @@ -1,4 +1,4 @@ -/* $NetBSD: netif.c,v 1.23 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: netif.c,v 1.24 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1993 Adam Glass @@ -74,7 +74,7 @@ netif_init(void) } } -int netif_match __P((struct netif *, void *)); +int netif_match(struct netif *, void *); int netif_match(struct netif *nif, void *machdep_hint) diff --git a/sys/lib/libsa/netif.h b/sys/lib/libsa/netif.h index f905325457eb..446f63ae24f9 100644 --- a/sys/lib/libsa/netif.h +++ b/sys/lib/libsa/netif.h @@ -1,4 +1,4 @@ -/* $NetBSD: netif.h,v 1.6 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: netif.h,v 1.7 2009/01/17 14:00:36 tsutsui Exp $ */ #ifndef __SYS_LIBNETBOOT_NETIF_H #define __SYS_LIBNETBOOT_NETIF_H @@ -9,12 +9,12 @@ struct netif; /* forward */ struct netif_driver { char *netif_bname; - int (*netif_match) __P((struct netif *, void *)); - int (*netif_probe) __P((struct netif *, void *)); - void (*netif_init) __P((struct iodesc *, void *)); - int (*netif_get) __P((struct iodesc *, void *, size_t, saseconds_t)); - int (*netif_put) __P((struct iodesc *, void *, size_t)); - void (*netif_end) __P((struct netif *)); + int (*netif_match)(struct netif *, void *); + int (*netif_probe)(struct netif *, void *); + void (*netif_init)(struct iodesc *, void *); + int (*netif_get)(struct iodesc *, void *, size_t, saseconds_t); + int (*netif_put)(struct iodesc *, void *, size_t); + void (*netif_end)(struct netif *); struct netif_dif *netif_ifs; int netif_nifs; }; @@ -50,13 +50,13 @@ extern int n_netif_drivers; extern int netif_debug; -void netif_init __P((void)); -struct netif *netif_select __P((void *)); -int netif_probe __P((struct netif *, void *)); -void netif_attach __P((struct netif *, struct iodesc *, void *)); -void netif_detach __P((struct netif *)); +void netif_init(void); +struct netif *netif_select(void *); +int netif_probe(struct netif *, void *); +void netif_attach(struct netif *, struct iodesc *, void *); +void netif_detach(struct netif *); -int netif_open __P((void *)); -int netif_close __P((int)); +int netif_open(void *); +int netif_close(int); #endif /* __SYS_LIBNETBOOT_NETIF_H */ diff --git a/sys/lib/libsa/nfs.c b/sys/lib/libsa/nfs.c index a52a574cfcb1..d5a09ca4d132 100644 --- a/sys/lib/libsa/nfs.c +++ b/sys/lib/libsa/nfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: nfs.c,v 1.44 2008/11/19 12:36:41 ad Exp $ */ +/* $NetBSD: nfs.c,v 1.45 2009/01/17 14:00:36 tsutsui Exp $ */ /*- * Copyright (c) 1993 John Brezak @@ -111,11 +111,11 @@ struct nfs_iodesc { struct nfs_iodesc nfs_root_node; -int nfs_getrootfh __P((struct iodesc *, char *, u_char *)); -int nfs_lookupfh __P((struct nfs_iodesc *, const char *, int, - struct nfs_iodesc *)); -int nfs_readlink __P((struct nfs_iodesc *, char *)); -ssize_t nfs_readdata __P((struct nfs_iodesc *, off_t, void *, size_t)); +int nfs_getrootfh(struct iodesc *, char *, u_char *); +int nfs_lookupfh(struct nfs_iodesc *, const char *, int, + struct nfs_iodesc *); +int nfs_readlink(struct nfs_iodesc *, char *); +ssize_t nfs_readdata(struct nfs_iodesc *, off_t, void *, size_t); /* * Fetch the root file handle (call mount daemon) diff --git a/sys/lib/libsa/rarp.c b/sys/lib/libsa/rarp.c index 6c47b4506b23..d302105e1ad1 100644 --- a/sys/lib/libsa/rarp.c +++ b/sys/lib/libsa/rarp.c @@ -1,4 +1,4 @@ -/* $NetBSD: rarp.c,v 1.29 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: rarp.c,v 1.30 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -76,8 +76,8 @@ struct ether_arp { #define arp_pln ea_hdr.ar_pln #define arp_op ea_hdr.ar_op -static ssize_t rarpsend __P((struct iodesc *, void *, size_t)); -static ssize_t rarprecv __P((struct iodesc *, void *, size_t, saseconds_t)); +static ssize_t rarpsend(struct iodesc *, void *, size_t); +static ssize_t rarprecv(struct iodesc *, void *, size_t, saseconds_t); /* * Ethernet (Reverse) Address Resolution Protocol (see RFC 903, and 826). diff --git a/sys/lib/libsa/rpc.c b/sys/lib/libsa/rpc.c index 30109c9c3464..b0ec1689c16b 100644 --- a/sys/lib/libsa/rpc.c +++ b/sys/lib/libsa/rpc.c @@ -1,4 +1,4 @@ -/* $NetBSD: rpc.c,v 1.28 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: rpc.c,v 1.29 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -103,7 +103,7 @@ struct rpc_reply { }; /* Local forwards */ -static ssize_t recvrpc __P((struct iodesc *, void *, size_t, saseconds_t)); +static ssize_t recvrpc(struct iodesc *, void *, size_t, saseconds_t); int rpc_xid; int rpc_port = 0x400; /* predecrement */ diff --git a/sys/lib/libsa/rpc.h b/sys/lib/libsa/rpc.h index 4f65b8b8c239..756cdc80c7f9 100644 --- a/sys/lib/libsa/rpc.h +++ b/sys/lib/libsa/rpc.h @@ -1,4 +1,4 @@ -/* $NetBSD: rpc.h,v 1.10 2007/11/24 13:20:57 isaki Exp $ */ +/* $NetBSD: rpc.h,v 1.11 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -49,12 +49,12 @@ #define PMAPPROC_CALLIT 5 /* RPC functions: */ -ssize_t rpc_call __P((struct iodesc *, n_long, n_long, n_long, - void *, size_t, void *, size_t)); -void rpc_fromaddr __P((void *, struct in_addr *, u_short *)); -int rpc_pmap_getcache __P((struct in_addr, u_int, u_int)); -void rpc_pmap_putcache __P((struct in_addr, u_int, u_int, int)); -int rpc_getport __P((struct iodesc *, n_long, n_long)); +ssize_t rpc_call(struct iodesc *, n_long, n_long, n_long, void *, size_t, + void *, size_t); +void rpc_fromaddr(void *, struct in_addr *, u_short *); +int rpc_pmap_getcache(struct in_addr, u_int, u_int); +void rpc_pmap_putcache(struct in_addr, u_int, u_int, int); +int rpc_getport(struct iodesc *, n_long, n_long); extern int rpc_port; /* decrement before bind */ diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index bc4770eca0a0..58d693cb65c7 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $NetBSD: stand.h,v 1.65 2008/11/19 12:36:41 ad Exp $ */ +/* $NetBSD: stand.h,v 1.66 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -255,7 +255,7 @@ int ioctl(int, u_long, char *); int stat(const char *, struct stat *); int fstat(int, struct stat *); -typedef int cmp_t __P((const void *, const void *)); +typedef int cmp_t(const void *, const void *); void qsort(void *, size_t, size_t, cmp_t *); extern int opterr, optind, optopt, optreset; diff --git a/sys/lib/libsa/tftp.c b/sys/lib/libsa/tftp.c index 267803557b0f..ce6d336f4d92 100644 --- a/sys/lib/libsa/tftp.c +++ b/sys/lib/libsa/tftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: tftp.c,v 1.28 2009/01/12 11:32:45 tsutsui Exp $ */ +/* $NetBSD: tftp.c,v 1.29 2009/01/17 14:00:36 tsutsui Exp $ */ /* * Copyright (c) 1996 @@ -90,13 +90,13 @@ static const int tftperrors[8] = { EINVAL, /* ??? */ }; -static ssize_t recvtftp __P((struct iodesc *, void *, size_t, saseconds_t)); -static int tftp_makereq __P((struct tftp_handle *)); -static int tftp_getnextblock __P((struct tftp_handle *)); +static ssize_t recvtftp(struct iodesc *, void *, size_t, saseconds_t); +static int tftp_makereq(struct tftp_handle *); +static int tftp_getnextblock(struct tftp_handle *); #ifndef TFTP_NOTERMINATE -static void tftp_terminate __P((struct tftp_handle *)); +static void tftp_terminate(struct tftp_handle *); #endif -static ssize_t tftp_size_of_file __P((struct tftp_handle *tftpfile)); +static ssize_t tftp_size_of_file(struct tftp_handle *tftpfile); static ssize_t recvtftp(struct iodesc *d, void *pkt, size_t len, saseconds_t tleft) diff --git a/sys/lib/libsa/ustarfs.c b/sys/lib/libsa/ustarfs.c index 9ccf5a8e8899..a1a583bdc546 100644 --- a/sys/lib/libsa/ustarfs.c +++ b/sys/lib/libsa/ustarfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ustarfs.c,v 1.31 2007/11/24 13:20:58 isaki Exp $ */ +/* $NetBSD: ustarfs.c,v 1.32 2009/01/17 14:00:36 tsutsui Exp $ */ /* [Notice revision 2.2] * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc. @@ -140,15 +140,15 @@ static const char formatid[] = "USTARFS", static const int ustarfs_mode_offset = BBSIZE; -static int checksig __P((ust_active_t *)); -static int convert __P((const char *, int, int)); -static int get_volume __P((struct open_file *, int)); +static int checksig(ust_active_t *); +static int convert(const char *, int, int); +static int get_volume(struct open_file *, int); static void setwindow(ust_active_t *, ustoffs, ustoffs); -static int real_fs_cylinder_read __P((struct open_file *, ustoffs, int)); -static int ustarfs_cylinder_read __P((struct open_file *, ustoffs, int)); -static void ustarfs_sscanf __P((const char *, const char *, int *)); -static int read512block __P((struct open_file *, ustoffs, char block[512])); -static int init_volzero_sig __P((struct open_file *)); +static int real_fs_cylinder_read(struct open_file *, ustoffs, int); +static int ustarfs_cylinder_read(struct open_file *, ustoffs, int); +static void ustarfs_sscanf(const char *, const char *, int *); +static int read512block(struct open_file *, ustoffs, char block[512]); +static int init_volzero_sig(struct open_file *); #ifdef HAVE_CHANGEDISK_HOOK /* @@ -156,7 +156,7 @@ static int init_volzero_sig __P((struct open_file *)); * Machine dependent code can eject the medium etc. * The new medium must be ready when this hook returns. */ -void changedisk_hook __P((struct open_file *)); +void changedisk_hook(struct open_file *); #endif static int