d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove multi-line __P() usage.

Browse Source
This commit is contained in:
David E. O'Brien 2002-03-22 09:22:15 +00:00
parent 10ddeb64d4
commit 1372519b15
30 changed files with 129 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libatm/libatm.h
View File

@ -85,15 +85,13 @@ extern int get_hex_atm_addr(char *, u_char *, int);
extern char *format_atm_addr(Atm_addr *);
/* cache_key.c */
extern void scsp_cache_key __P((Atm_addr *,
struct in_addr *, int, char *));
extern void scsp_cache_key(Atm_addr *,
struct in_addr *, int, char *);
/* ioctl_subr.c */
extern int do_info_ioctl(struct atminfreq *, int);
extern int get_vcc_info __P((char *,
struct air_vcc_rsp **));
extern int get_subnet_mask __P((char *,
struct sockaddr_in *));
extern int get_vcc_info(char *, struct air_vcc_rsp **);
extern int get_subnet_mask(char *, struct sockaddr_in *);
extern int get_mtu(char *);
extern int verify_nif_name(char *);
extern int get_cfg_info(char *, struct air_cfg_rsp **);

4
lib/libc/db/btree/extern.h
View File

@ -53,8 +53,8 @@ int __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
EPG *__bt_search(BTREE *, const DBT *, int *);
int __bt_seq(const DB *, DBT *, DBT *, u_int);
void __bt_setcur(BTREE *, pgno_t, u_int);
int __bt_split __P((BTREE *, PAGE *,
const DBT *, const DBT *, int, size_t, u_int32_t));
int __bt_split(BTREE *, PAGE *,
const DBT *, const DBT *, int, size_t, u_int32_t);
int __bt_sync(const DB *, u_int);
int __ovfl_delete(BTREE *, void *);

4
lib/libc/db/hash/extern.h
View File

@ -40,8 +40,8 @@ int __big_delete(HTAB *, BUFHEAD *);
int __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
int __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
int __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
int __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
int, u_int32_t, SPLIT_RETURN *));
int __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
int, u_int32_t, SPLIT_RETURN *);
int __buf_free(HTAB *, int, int);
void __buf_init(HTAB *, int);
u_int32_t __call_hash(HTAB *, char *, int);

2
lib/libc/db/hash/hash_func.c
View File

@ -53,7 +53,7 @@ static u_int32_t hash3(const void *, size_t);
static u_int32_t hash4(const void *, size_t);
/* Global default hash function */
u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
u_int32_t (*__default_hash)(const void *, size_t) = hash4;
/*
* HASH FUNCTIONS

2
lib/libc/db/test/dbtest.c
View File

@ -64,7 +64,7 @@ enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
void compare(DBT *, DBT *);
DBTYPE dbtype(char *);
void dump(DB *, int);
void err __P((const char *, ...)) __printflike(1, 2);
void err(const char *, ...) __printflike(1, 2);
void get(DB *, DBT *);
void getdata(DB *, DBT *, DBT *);
void put(DB *, DBT *, DBT *);

9
lib/libc/gen/getcap.c
View File

@ -70,7 +70,7 @@ static char *toprec; /* Additional record specified by cgetset() */
static int gottoprec; /* Flag indicating retrieval of toprecord */
static int cdbget(DB *, char **, char *);
static int getent(char **, u_int *, char **, int, char *, int, char *);
static int getent(char **, u_int *, char **, int, const char *, int, char *);
static int nfcmp(char *, char *);
/*
@ -113,7 +113,8 @@ cgetset(const char *ent)
char *
cgetcap(char *buf, const char *cap, int type)
{
char *bp, *cp;
char *bp;
const char *cp;
bp = buf;
for (;;) {
@ -187,8 +188,8 @@ cgetent(char **buf, char **db_array, const char *name)
* MAX_RECURSION.
*/
static int
getent(char **cap, u_int *len, char **db_array, int fd, char *name, int depth,
char *nfield)
getent(char **cap, u_int *len, char **db_array, int fd, const char *name,
int depth, char *nfield)
{
DB *capdbp;
char *r_end, *rp, **db_p;

32
lib/libc/net/getaddrinfo.c
View File

@ -218,18 +218,18 @@ struct res_target {
};
static int str_isnumber(const char *);
static int explore_fqdn __P((const struct addrinfo *, const char *,
const char *, struct addrinfo **));
static int explore_null __P((const struct addrinfo *,
const char *, struct addrinfo **));
static int explore_numeric __P((const struct addrinfo *, const char *,
const char *, struct addrinfo **));
static int explore_numeric_scope __P((const struct addrinfo *, const char *,
const char *, struct addrinfo **));
static int get_canonname __P((const struct addrinfo *,
struct addrinfo *, const char *));
static struct addrinfo *get_ai __P((const struct addrinfo *,
const struct afd *, const char *));
static int explore_fqdn(const struct addrinfo *, const char *,
const char *, struct addrinfo **);
static int explore_null(const struct addrinfo *,
const char *, struct addrinfo **);
static int explore_numeric(const struct addrinfo *, const char *,
const char *, struct addrinfo **);
static int explore_numeric_scope(const struct addrinfo *, const char *,
const char *, struct addrinfo **);
static int get_canonname(const struct addrinfo *,
struct addrinfo *, const char *);
static struct addrinfo *get_ai(const struct addrinfo *,
const struct afd *, const char *);
static int get_portmatch(const struct addrinfo *, const char *);
static int get_port(struct addrinfo *, const char *, int);
static const struct afd *find_afd(int);
@ -238,8 +238,8 @@ static int addrconfig(struct addrinfo *);
static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
#endif
static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int,
const struct addrinfo *));
static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
const struct addrinfo *);
static int _dns_getaddrinfo(void *, void *, va_list);
static void _sethtent(void);
static void _endhtent(void);
@ -253,8 +253,8 @@ extern int _yp_check(char **);
static int res_queryN(const char *, struct res_target *);
static int res_searchN(const char *, struct res_target *);
static int res_querydomainN __P((const char *, const char *,
struct res_target *));
static int res_querydomainN(const char *, const char *,
struct res_target *);
static char *ai_errlist[] = {
"Success",

4
lib/libc/net/getnameinfo.c
View File

@ -81,8 +81,8 @@ struct sockinet {
};
#ifdef INET6
static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
size_t, int));
static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
size_t, int);
static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
#endif

4
lib/libc/net/inet_net_ntop.c
View File

@ -36,8 +36,8 @@ static const char rcsid[] = "$FreeBSD$";
# define SPRINTF(x) ((size_t)sprintf x)
#endif
static char * inet_net_ntop_ipv4 __P((const u_char *src, int bits,
char *dst, size_t size));
static char * inet_net_ntop_ipv4(const u_char *src, int bits, char *dst,
size_t size);
/*
* char *

3
lib/libc/net/inet_net_pton.c
View File

@ -38,8 +38,7 @@ static const char rcsid[] = "$FreeBSD$";
# define SPRINTF(x) ((size_t)sprintf x)
#endif
static int inet_net_pton_ipv4 __P((const char *src, u_char *dst,
size_t size));
static int inet_net_pton_ipv4(const char *src, u_char *dst, size_t size);
/*
* static int

6
lib/libc/net/inet_ntop.c
View File

@ -38,10 +38,8 @@ __FBSDID("$FreeBSD$");
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
*/
static const char *inet_ntop4 __P((const u_char *src, char *dst,
socklen_t size));
static const char *inet_ntop6 __P((const u_char *src, char *dst,
socklen_t size));
static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
/* char *
* inet_ntop(af, src, dst, size)

4
lib/libc/net/name6.c
View File

@ -976,8 +976,8 @@ typedef union {
u_char buf[MAXPACKET];
} querybuf;
static struct hostent *getanswer __P((const querybuf *, int, const char *,
int, struct hostent *, int *));
static struct hostent *getanswer(const querybuf *, int, const char *, int,
struct hostent *, int *);
/*
* we don't need to take care about sorting, nor IPv4 mapped address here.

12
lib/libc/net/rcmd.c
View File

@ -72,13 +72,11 @@ extern int innetgr( const char *, const char *, const char *, const char * );
#define max(a, b) ((a > b) ? a : b)
int __ivaliduser(FILE *, u_int32_t, const char *, const char *);
int __ivaliduser_af __P((FILE *,const void *, const char *, const char *,
int, int));
int __ivaliduser_sa __P((FILE *, const struct sockaddr *, socklen_t,
const char *,const char *));
static int __icheckhost __P((const struct sockaddr *, socklen_t,
const char *));
int __ivaliduser(FILE *, u_int32_t, const char *, const char *);
int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int);
int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *,
const char *);
static int __icheckhost(const struct sockaddr *, socklen_t, const char *);
char paddr[NI_MAXHOST];

4
lib/libc/rpc/clnt_dg.c
View File

@ -69,8 +69,8 @@ static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
static struct clnt_ops *clnt_dg_ops(void);
static bool_t time_not_ok(struct timeval *);
static enum clnt_stat clnt_dg_call __P((CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval));
static enum clnt_stat clnt_dg_call(CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval);
static void clnt_dg_geterr(CLIENT *, struct rpc_err *);
static bool_t clnt_dg_freeres(CLIENT *, xdrproc_t, caddr_t);
static void clnt_dg_abort(CLIENT *);

4
lib/libc/rpc/clnt_raw.c
View File

@ -76,8 +76,8 @@ static struct clntraw_private {
u_int mcnt;
} *clntraw_private;
static enum clnt_stat clnt_raw_call __P((CLIENT *, rpcproc_t, xdrproc_t,
caddr_t, xdrproc_t, caddr_t, struct timeval));
static enum clnt_stat clnt_raw_call(CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval);
static void clnt_raw_geterr(CLIENT *, struct rpc_err *);
static bool_t clnt_raw_freeres(CLIENT *, xdrproc_t, caddr_t);
static void clnt_raw_abort(CLIENT *);

4
lib/libc/rpc/clnt_vc.c
View File

@ -87,8 +87,8 @@ struct cmessage {
struct cmsgcred cmcred;
};
static enum clnt_stat clnt_vc_call __P((CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval));
static enum clnt_stat clnt_vc_call(CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval);
static void clnt_vc_geterr(CLIENT *, struct rpc_err *);
static bool_t clnt_vc_freeres(CLIENT *, xdrproc_t, caddr_t);
static void clnt_vc_abort(CLIENT *);

5
lib/libc/rpc/rpc_com.h
View File

@ -73,9 +73,8 @@ int __rpc_socktype2seman(int);
void *rpc_nullproc(CLIENT *);
int __rpc_sockisbound(int);
struct netbuf *__rpcb_findaddr __P((rpcprog_t, rpcvers_t,
const struct netconfig *,
const char *, CLIENT **));
struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
const char *, CLIENT **);
bool_t __rpc_control(int,void *);
char *_get_next_token(char *, int);

4
lib/libc/rpc/rpc_soc.c
View File

@ -78,8 +78,8 @@ static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
extern mutex_t rpcsoc_lock;
static CLIENT *clnt_com_create __P((struct sockaddr_in *, rpcprog_t, rpcvers_t,
int *, u_int, u_int, char *));
static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t,
int *, u_int, u_int, char *);
static SVCXPRT *svc_com_create(int, u_int, u_int, char *);
static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *);

9
lib/libc/rpc/rpcb_clnt.c
View File

@ -102,13 +102,10 @@ extern int __rpc_lowvers;
static struct address_cache *check_cache(const char *, const char *);
static void delete_cache(struct netbuf *);
static void add_cache __P((const char *, const char *, struct netbuf *,
char *));
static CLIENT *getclnthandle __P((const char *, const struct netconfig *,
char **));
static void add_cache(const char *, const char *, struct netbuf *, char *);
static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
static CLIENT *local_rpcb(void);
static struct netbuf *got_entry __P((rpcb_entry_list_ptr,
const struct netconfig *));
static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
/*
* This routine adjusts the timeout used for calls to the remote rpcbind.

4
lib/libc/rpc/svc.c
View File

@ -88,8 +88,8 @@ static struct svc_callout {
extern rwlock_t svc_lock;
extern rwlock_t svc_fd_lock;
static struct svc_callout *svc_find __P((rpcprog_t, rpcvers_t,
struct svc_callout **, char *));
static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
struct svc_callout **, char *);
/* *************** SVCXPRT related stuff **************** */

6
lib/libc/rpc/svc_vc.c
View File

@ -613,11 +613,11 @@ svc_vc_rendezvous_ops(xprt)
ops.xp_recv = rendezvous_request;
ops.xp_stat = rendezvous_stat;
ops.xp_getargs =
(bool_t (*) __P((SVCXPRT *, xdrproc_t, caddr_t)))abort;
(bool_t (*)(SVCXPRT *, xdrproc_t, caddr_t))abort;
ops.xp_reply =
(bool_t (*) __P((SVCXPRT *, struct rpc_msg *)))abort;
(bool_t (*)(SVCXPRT *, struct rpc_msg *))abort;
ops.xp_freeargs =
(bool_t (*) __P((SVCXPRT *, xdrproc_t, caddr_t)))abort,
(bool_t (*)(SVCXPRT *, xdrproc_t, caddr_t))abort,
ops.xp_destroy = svc_vc_destroy;
ops2.xp_control = svc_vc_control;
}

10
lib/libc/stdio/vfprintf.c
View File

@ -113,11 +113,11 @@ enum typeid {
};
static int __sprint(FILE *, struct __suio *);
static int __sbprintf __P((FILE *, const char *, va_list)) __printflike(2, 0);
static char *__ujtoa __P((uintmax_t, char *, int, int, char *, int,
char, const char *));
static char *__ultoa __P((u_long, char *, int, int, char *, int,
char, const char *));
static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 0);
static char *__ujtoa(uintmax_t, char *, int, int, char *, int, char,
const char *);
static char *__ultoa(u_long, char *, int, int, char *, int, char,
const char *);
static void __find_arguments(const char *, va_list, union arg **);
static void __grow_type_table(int, enum typeid **, int *);

4
lib/libc/stdlib/radixsort.c
View File

@ -66,8 +66,8 @@ typedef struct {
static inline void simplesort
(const u_char **, int, int, const u_char *, u_int);
static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
static void r_sort_b __P((const u_char **,
const u_char **, int, int, const u_char *, u_int));
static void r_sort_b(const u_char **, const u_char **, int, int,
const u_char *, u_int);
#define THRESHOLD 20 /* Divert to simplesort(). */
#define SIZE 512 /* Default stack size. */

4
lib/libc/stdlib/twalk.c
View File

@ -22,8 +22,8 @@ __RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $");
#include <search.h>
#include <stdlib.h>
static void trecurse __P((const node_t *,
void (*action)(const void *, VISIT, int), int level));
static void trecurse(const node_t *,
void (*action)(const void *, VISIT, int), int level);
/* Walk the nodes of a tree */
static void

7
lib/libipsec/ipsec_dump_policy.c
View File

@ -57,10 +57,9 @@ static const char *ipsp_policy_strs[] = {
"discard", "none", "ipsec", "entrust", "bypass",
};
static char *ipsec_dump_ipsecrequest __P((char *, size_t,
struct sadb_x_ipsecrequest *, size_t));
static int set_addresses __P((char *, size_t, struct sockaddr *,
struct sockaddr *));
static char *ipsec_dump_ipsecrequest(char *, size_t,
struct sadb_x_ipsecrequest *, size_t);
static int set_addresses(char *, size_t, struct sockaddr *, struct sockaddr *);
static char *set_address(char *, size_t, struct sockaddr *);
/*

56
lib/libipsec/libpfkey.h
View File

@ -41,44 +41,40 @@ int ipsec_check_keylen2(u_int, u_int, u_int);
int ipsec_get_keylen(u_int, u_int, struct sadb_alg *);
u_int pfkey_set_softrate(u_int, u_int);
u_int pfkey_get_softrate(u_int);
int pfkey_send_getspi __P((int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t));
int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int,
caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
u_int64_t, u_int64_t, u_int32_t));
int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int,
caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
u_int64_t, u_int64_t, u_int32_t));
int pfkey_send_delete __P((int, u_int, u_int,
struct sockaddr *, struct sockaddr *, u_int32_t));
int pfkey_send_delete_all __P((int, u_int, u_int,
struct sockaddr *, struct sockaddr *));
int pfkey_send_get __P((int, u_int, u_int,
struct sockaddr *, struct sockaddr *, u_int32_t));
int pfkey_send_getspi(int, u_int, u_int, struct sockaddr *, struct sockaddr *,
u_int32_t, u_int32_t, u_int32_t, u_int32_t);
int pfkey_send_update(int, u_int, u_int, struct sockaddr *, struct sockaddr *,
u_int32_t, u_int32_t, u_int, caddr_t, u_int, u_int, u_int, u_int,
u_int, u_int32_t, u_int64_t, u_int64_t, u_int64_t, u_int32_t);
int pfkey_send_add(int, u_int, u_int, struct sockaddr *, struct sockaddr *,
u_int32_t, u_int32_t, u_int, caddr_t, u_int, u_int, u_int, u_int,
u_int, u_int32_t, u_int64_t, u_int64_t, u_int64_t, u_int32_t);
int pfkey_send_delete(int, u_int, u_int, struct sockaddr *, struct sockaddr *,
u_int32_t);
int pfkey_send_delete_all(int, u_int, u_int, struct sockaddr *,
struct sockaddr *);
int pfkey_send_get(int, u_int, u_int, struct sockaddr *, struct sockaddr *,
u_int32_t);
int pfkey_send_register(int, u_int);
int pfkey_recv_register(int);
int pfkey_set_supported(struct sadb_msg *, int);
int pfkey_send_flush(int, u_int);
int pfkey_send_dump(int, u_int);
int pfkey_send_promisc_toggle(int, int);
int pfkey_send_spdadd __P((int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
int pfkey_send_spdadd2 __P((int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
caddr_t, int, u_int32_t));
int pfkey_send_spdupdate __P((int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
caddr_t, int, u_int32_t));
int pfkey_send_spddelete __P((int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
int pfkey_send_spdadd(int, struct sockaddr *, u_int, struct sockaddr *, u_int,
u_int, caddr_t, int, u_int32_t);
int pfkey_send_spdadd2(int, struct sockaddr *, u_int, struct sockaddr *, u_int,
u_int, u_int64_t, u_int64_t, caddr_t, int, u_int32_t);
int pfkey_send_spdupdate(int, struct sockaddr *, u_int, struct sockaddr *,
u_int, u_int, caddr_t, int, u_int32_t);
int pfkey_send_spdupdate2(int, struct sockaddr *, u_int, struct sockaddr *,
u_int, u_int, u_int64_t, u_int64_t, caddr_t, int, u_int32_t);
int pfkey_send_spddelete(int, struct sockaddr *, u_int, struct sockaddr *,
u_int, u_int, caddr_t, int, u_int32_t);
int pfkey_send_spddelete2(int, u_int32_t);
int pfkey_send_spdget(int, u_int32_t);
int pfkey_send_spdsetidx __P((int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
int pfkey_send_spdsetidx(int, struct sockaddr *, u_int, struct sockaddr *,
u_int, u_int, caddr_t, int, u_int32_t);
int pfkey_send_spdflush(int);
int pfkey_send_spddump(int);

28
lib/libipsec/pfkey.c
View File

@ -54,27 +54,27 @@ __FBSDID("$FreeBSD$");
static int findsupportedmap(int);
static int setsupportedmap(struct sadb_supported *);
static struct sadb_alg *findsupportedalg(u_int, u_int);
static int pfkey_send_x1 __P((int, u_int, u_int, u_int, struct sockaddr *,
static int pfkey_send_x1(int, u_int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t,
u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t,
u_int32_t, u_int32_t, u_int32_t));
static int pfkey_send_x2 __P((int, u_int, u_int, u_int,
struct sockaddr *, struct sockaddr *, u_int32_t));
u_int32_t, u_int32_t, u_int32_t);
static int pfkey_send_x2(int, u_int, u_int, u_int,
struct sockaddr *, struct sockaddr *, u_int32_t);
static int pfkey_send_x3(int, u_int, u_int);
static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int,
static int pfkey_send_x4(int, u_int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
char *, int, u_int32_t));
char *, int, u_int32_t);
static int pfkey_send_x5(int, u_int, u_int32_t);
static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int,
u_int, u_int32_t, pid_t));
static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int,
u_int, u_int, u_int32_t));
static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int,
struct sockaddr *, u_int, u_int));
static caddr_t pfkey_setsadbmsg(caddr_t, caddr_t, u_int, u_int,
u_int, u_int32_t, pid_t);
static caddr_t pfkey_setsadbsa(caddr_t, caddr_t, u_int32_t, u_int,
u_int, u_int, u_int32_t);
static caddr_t pfkey_setsadbaddr(caddr_t, caddr_t, u_int,
struct sockaddr *, u_int, u_int);
static caddr_t pfkey_setsadbkey(caddr_t, caddr_t, u_int, caddr_t, u_int);
static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t,
u_int32_t, u_int32_t, u_int32_t));
static caddr_t pfkey_setsadblifetime(caddr_t, caddr_t, u_int, u_int32_t,
u_int32_t, u_int32_t, u_int32_t);
static caddr_t pfkey_setsadbxsa2(caddr_t, caddr_t, u_int32_t, u_int32_t);
/*

7
lib/libkvm/kvm_private.h
View File

@ -70,13 +70,14 @@ struct __kvm {
/*
* Functions used internally by kvm, but across kvm modules.
*/
void _kvm_err __P((kvm_t *kd, const char *program, const char *fmt, ...)) __printflike(3, 4);
void _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...)
__printflike(3, 4);
void _kvm_freeprocs(kvm_t *kd);
void _kvm_freevtop(kvm_t *);
int _kvm_initvtop(kvm_t *);
int _kvm_kvatop(kvm_t *, u_long, u_long *);
void *_kvm_malloc(kvm_t *kd, size_t);
void *_kvm_realloc(kvm_t *kd, void *, size_t);
void _kvm_syserr
__P((kvm_t *kd, const char *program, const char *fmt, ...)) __printflike(3, 4);
void _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...)
__printflike(3, 4);
int _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);

5
lib/libncp/ipx.c
View File

@ -188,8 +188,9 @@ void ipx_assign_node(IPXNode *dest, IPXNode *src) {
static void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
static int if_ipxscan __P((int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm,
struct ifa_msghdr *ifam,struct ipx_addr *addr));
static int if_ipxscan(int addrcount, struct sockaddr_dl *sdl,
struct if_msghdr *ifm, struct ifa_msghdr *ifam,
struct ipx_addr *addr);
/*
* Find an IPX interface.

15
lib/libutil/libutil.h
View File

@ -49,17 +49,16 @@ struct in_addr;
__BEGIN_DECLS
int extattr_namespace_to_string(int _attrnamespace, char **_string);
int extattr_string_to_namespace __P((const char *_string,
int *_attrnamespace));
int extattr_string_to_namespace(const char *_string, int *_attrnamespace);
void login(struct utmp *_ut);
int login_tty(int _fd);
int logout(const char *_line);
void logwtmp(const char *_line, const char *_name, const char *_host);
void trimdomain(char *_fullhost, int _hostsize);
int openpty __P((int *_amaster, int *_aslave, char *_name,
struct termios *_termp, struct winsize *_winp));
int forkpty __P((int *_amaster, char *_name,
struct termios *_termp, struct winsize *_winp));
int openpty(int *_amaster, int *_aslave, char *_name,
struct termios *_termp, struct winsize *_winp);
int forkpty(int *_amaster, char *_name,
struct termios *_termp, struct winsize *_winp);
const char *uu_lockerr(int _uu_lockresult);
int uu_lock(const char *_ttyname);
int uu_unlock(const char *_ttyname);
@ -71,8 +70,8 @@ char *property_find(properties list, const char *name);
char *auth_getval(const char *name);
int realhostname(char *host, size_t hsize, const struct in_addr *ip);
struct sockaddr;
int realhostname_sa __P((char *host, size_t hsize, struct sockaddr *addr,
int addrlen));
int realhostname_sa(char *host, size_t hsize, struct sockaddr *addr,
int addrlen);
#ifdef _STDIO_H_ /* avoid adding new includes */
char *fparseln(FILE *, size_t *, size_t *, const char[3], int);
#endif