Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 2a44d862233f2126581e290d568e1c8b8f2eb9f5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Carlo Landmeter <clandmeter@gmail.com> |
| 3 | Date: Thu, 19 Feb 2015 15:28:45 +0000 |
| 4 | Subject: [PATCH] Avoid use of glibc sys/cdefs.h header |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | --- |
| 8 | src/check_bound.c | 2 +- |
| 9 | src/pmap_svc.c | 10 +++++----- |
| 10 | src/rpcb_svc.c | 10 +++++----- |
| 11 | src/rpcb_svc_4.c | 14 +++++++------- |
| 12 | src/rpcb_svc_com.c | 46 +++++++++++++++++++++++----------------------- |
| 13 | src/rpcbind.c | 12 ++++++------ |
| 14 | src/util.c | 2 +- |
| 15 | src/warmstart.c | 4 ++-- |
| 16 | 8 files changed, 50 insertions(+), 50 deletions(-) |
| 17 | |
| 18 | diff --git a/src/check_bound.c b/src/check_bound.c |
| 19 | index c70b845..5d21730 100644 |
| 20 | --- a/src/check_bound.c |
| 21 | +++ b/src/check_bound.c |
| 22 | @@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */ |
| 23 | static struct fdlist *fdtail; |
| 24 | static char *nullstring = ""; |
| 25 | |
| 26 | -static bool_t check_bound __P((struct fdlist *, char *uaddr)); |
| 27 | +static bool_t check_bound (struct fdlist *, char *uaddr); |
| 28 | |
| 29 | /* |
| 30 | * Returns 1 if the given address is bound for the given addr & transport |
| 31 | diff --git a/src/pmap_svc.c b/src/pmap_svc.c |
| 32 | index ad28b93..9c7d409 100644 |
| 33 | --- a/src/pmap_svc.c |
| 34 | +++ b/src/pmap_svc.c |
| 35 | @@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; |
| 36 | #include "rpcbind.h" |
| 37 | #include "xlog.h" |
| 38 | #include <rpc/svc_soc.h> /* svc_getcaller routine definition */ |
| 39 | -static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, |
| 40 | - rpcprot_t)); |
| 41 | -static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long)); |
| 42 | -static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *)); |
| 43 | -static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *)); |
| 44 | +static struct pmaplist *find_service_pmap (rpcprog_t, rpcvers_t, |
| 45 | + rpcprot_t); |
| 46 | +static bool_t pmapproc_change (struct svc_req *, SVCXPRT *, u_long); |
| 47 | +static bool_t pmapproc_getport (struct svc_req *, SVCXPRT *); |
| 48 | +static bool_t pmapproc_dump (struct svc_req *, SVCXPRT *); |
| 49 | |
| 50 | /* |
| 51 | * Called for all the version 2 inquiries. |
| 52 | diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c |
| 53 | index bd92201..6c7f7fe 100644 |
| 54 | --- a/src/rpcb_svc.c |
| 55 | +++ b/src/rpcb_svc.c |
| 56 | @@ -53,10 +53,10 @@ |
| 57 | #include "rpcbind.h" |
| 58 | #include "xlog.h" |
| 59 | |
| 60 | -static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, |
| 61 | - rpcvers_t)); |
| 62 | -static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *, |
| 63 | - rpcvers_t)); |
| 64 | +static void *rpcbproc_getaddr_3_local (void *, struct svc_req *, SVCXPRT *, |
| 65 | + rpcvers_t); |
| 66 | +static void *rpcbproc_dump_3_local (void *, struct svc_req *, SVCXPRT *, |
| 67 | + rpcvers_t); |
| 68 | |
| 69 | /* |
| 70 | * Called by svc_getreqset. There is a separate server handle for |
| 71 | @@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) |
| 72 | } argument; |
| 73 | char *result; |
| 74 | xdrproc_t xdr_argument, xdr_result; |
| 75 | - void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); |
| 76 | + void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t); |
| 77 | rpcprog_t setprog = 0; |
| 78 | |
| 79 | rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); |
| 80 | diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c |
| 81 | index b673452..6764c0a 100644 |
| 82 | --- a/src/rpcb_svc_4.c |
| 83 | +++ b/src/rpcb_svc_4.c |
| 84 | @@ -54,13 +54,13 @@ |
| 85 | #include "rpcbind.h" |
| 86 | #include "xlog.h" |
| 87 | |
| 88 | -static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, |
| 89 | - rpcvers_t)); |
| 90 | -static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); |
| 91 | +static void *rpcbproc_getaddr_4_local (void *, struct svc_req *, SVCXPRT *, |
| 92 | + rpcvers_t); |
| 93 | +static void *rpcbproc_getversaddr_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t); |
| 94 | static void *rpcbproc_getaddrlist_4_local |
| 95 | - __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); |
| 96 | -static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *)); |
| 97 | -static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); |
| 98 | + (void *, struct svc_req *, SVCXPRT *, rpcvers_t); |
| 99 | +static void free_rpcb_entry_list (rpcb_entry_list_ptr *); |
| 100 | +static void *rpcbproc_dump_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t); |
| 101 | |
| 102 | /* |
| 103 | * Called by svc_getreqset. There is a separate server handle for |
| 104 | @@ -78,7 +78,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) |
| 105 | } argument; |
| 106 | char *result; |
| 107 | xdrproc_t xdr_argument, xdr_result; |
| 108 | - void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); |
| 109 | + void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t); |
| 110 | rpcprog_t setprog = 0; |
| 111 | |
| 112 | rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); |
| 113 | diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c |
| 114 | index ff9ce6b..8aef9e5 100644 |
| 115 | --- a/src/rpcb_svc_com.c |
| 116 | +++ b/src/rpcb_svc_com.c |
| 117 | @@ -100,29 +100,29 @@ struct finfo { |
| 118 | static struct finfo FINFO[NFORWARD]; |
| 119 | |
| 120 | |
| 121 | -static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *)); |
| 122 | -static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *)); |
| 123 | -static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *)); |
| 124 | -static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *)); |
| 125 | -static int find_rmtcallfd_by_netid __P((char *)); |
| 126 | -static SVCXPRT *find_rmtcallxprt_by_fd __P((int)); |
| 127 | -static int forward_register __P((u_int32_t, struct netbuf *, int, char *, |
| 128 | - rpcproc_t, rpcvers_t, u_int32_t *)); |
| 129 | -static struct finfo *forward_find __P((u_int32_t)); |
| 130 | -static int free_slot_by_xid __P((u_int32_t)); |
| 131 | -static int free_slot_by_index __P((int)); |
| 132 | -static int netbufcmp __P((struct netbuf *, struct netbuf *)); |
| 133 | -static struct netbuf *netbufdup __P((struct netbuf *)); |
| 134 | -static void netbuffree __P((struct netbuf *)); |
| 135 | -static int check_rmtcalls __P((struct pollfd *, int)); |
| 136 | -static void xprt_set_caller __P((SVCXPRT *, struct finfo *)); |
| 137 | -static void send_svcsyserr __P((SVCXPRT *, struct finfo *)); |
| 138 | -static void handle_reply __P((int, SVCXPRT *)); |
| 139 | -static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *)); |
| 140 | -static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *)); |
| 141 | -static char *getowner __P((SVCXPRT *, char *, size_t)); |
| 142 | -static int add_pmaplist __P((RPCB *)); |
| 143 | -static int del_pmaplist __P((RPCB *)); |
| 144 | +static bool_t xdr_encap_parms (XDR *, struct encap_parms *); |
| 145 | +static bool_t xdr_rmtcall_args (XDR *, struct r_rmtcall_args *); |
| 146 | +static bool_t xdr_rmtcall_result (XDR *, struct r_rmtcall_args *); |
| 147 | +static bool_t xdr_opaque_parms (XDR *, struct r_rmtcall_args *); |
| 148 | +static int find_rmtcallfd_by_netid (char *); |
| 149 | +static SVCXPRT *find_rmtcallxprt_by_fd (int); |
| 150 | +static int forward_register (u_int32_t, struct netbuf *, int, char *, |
| 151 | + rpcproc_t, rpcvers_t, u_int32_t *); |
| 152 | +static struct finfo *forward_find (u_int32_t); |
| 153 | +static int free_slot_by_xid (u_int32_t); |
| 154 | +static int free_slot_by_index (int); |
| 155 | +static int netbufcmp (struct netbuf *, struct netbuf *); |
| 156 | +static struct netbuf *netbufdup (struct netbuf *); |
| 157 | +static void netbuffree (struct netbuf *); |
| 158 | +static int check_rmtcalls (struct pollfd *, int); |
| 159 | +static void xprt_set_caller (SVCXPRT *, struct finfo *); |
| 160 | +static void send_svcsyserr (SVCXPRT *, struct finfo *); |
| 161 | +static void handle_reply (int, SVCXPRT *); |
| 162 | +static void find_versions (rpcprog_t, char *, rpcvers_t *, rpcvers_t *); |
| 163 | +static rpcblist_ptr find_service (rpcprog_t, rpcvers_t, char *); |
| 164 | +static char *getowner (SVCXPRT *, char *, size_t); |
| 165 | +static int add_pmaplist (RPCB *); |
| 166 | +static int del_pmaplist (RPCB *); |
| 167 | |
| 168 | /* |
| 169 | * Set a mapping of program, version, netid |
| 170 | diff --git a/src/rpcbind.c b/src/rpcbind.c |
| 171 | index 045daa1..137011b 100644 |
| 172 | --- a/src/rpcbind.c |
| 173 | +++ b/src/rpcbind.c |
| 174 | @@ -135,13 +135,13 @@ char *tcp_uaddr; /* Universal TCP address */ |
| 175 | static char servname[] = "rpcbind"; |
| 176 | static char superuser[] = "superuser"; |
| 177 | |
| 178 | -int main __P((int, char *[])); |
| 179 | +int main (int, char *[]); |
| 180 | |
| 181 | -static int init_transport __P((struct netconfig *)); |
| 182 | -static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *, |
| 183 | - struct netbuf *)); |
| 184 | -static void terminate __P((int)); |
| 185 | -static void parseargs __P((int, char *[])); |
| 186 | +static int init_transport (struct netconfig *); |
| 187 | +static void rbllist_add (rpcprog_t, rpcvers_t, struct netconfig *, |
| 188 | + struct netbuf *); |
| 189 | +static void terminate (int); |
| 190 | +static void parseargs (int, char *[]); |
| 191 | |
| 192 | int |
| 193 | main(int argc, char *argv[]) |
| 194 | diff --git a/src/util.c b/src/util.c |
| 195 | index a6c835b..33b9e4f 100644 |
| 196 | --- a/src/util.c |
| 197 | +++ b/src/util.c |
| 198 | @@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4; |
| 199 | static struct sockaddr_in6 *local_in6; |
| 200 | #endif |
| 201 | |
| 202 | -static int bitmaskcmp __P((void *, void *, void *, int)); |
| 203 | +static int bitmaskcmp (void *, void *, void *, int); |
| 204 | |
| 205 | /* |
| 206 | * For all bits set in "mask", compare the corresponding bits in |
| 207 | diff --git a/src/warmstart.c b/src/warmstart.c |
| 208 | index b6eb73e..42dd3af 100644 |
| 209 | --- a/src/warmstart.c |
| 210 | +++ b/src/warmstart.c |
| 211 | @@ -58,8 +58,8 @@ |
| 212 | #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" |
| 213 | #endif |
| 214 | |
| 215 | -static bool_t write_struct __P((char *, xdrproc_t, void *)); |
| 216 | -static bool_t read_struct __P((char *, xdrproc_t, void *)); |
| 217 | +static bool_t write_struct (char *, xdrproc_t, void *); |
| 218 | +static bool_t read_struct (char *, xdrproc_t, void *); |
| 219 | |
| 220 | static bool_t |
| 221 | write_struct(char *filename, xdrproc_t structproc, void *list) |