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
7 src/check_bound.c | 2 +-
8 src/pmap_svc.c | 10 +++++-----
9 src/rpcb_svc.c | 10 +++++-----
10 src/rpcb_svc_4.c | 14 +++++++-------
11 src/rpcb_svc_com.c | 46 +++++++++++++++++++++++-----------------------
12 src/rpcbind.c | 12 ++++++------
14 src/warmstart.c | 4 ++--
15 8 files changed, 50 insertions(+), 50 deletions(-)
17 diff --git a/src/check_bound.c b/src/check_bound.c
18 index c70b845..5d21730 100644
19 --- a/src/check_bound.c
20 +++ b/src/check_bound.c
21 @@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */
22 static struct fdlist *fdtail;
23 static char *nullstring = "";
25 -static bool_t check_bound __P((struct fdlist *, char *uaddr));
26 +static bool_t check_bound (struct fdlist *, char *uaddr);
29 * Returns 1 if the given address is bound for the given addr & transport
30 diff --git a/src/pmap_svc.c b/src/pmap_svc.c
31 index ad28b93..9c7d409 100644
34 @@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
37 #include <rpc/svc_soc.h> /* svc_getcaller routine definition */
38 -static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
40 -static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long));
41 -static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *));
42 -static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *));
43 +static struct pmaplist *find_service_pmap (rpcprog_t, rpcvers_t,
45 +static bool_t pmapproc_change (struct svc_req *, SVCXPRT *, u_long);
46 +static bool_t pmapproc_getport (struct svc_req *, SVCXPRT *);
47 +static bool_t pmapproc_dump (struct svc_req *, SVCXPRT *);
50 * Called for all the version 2 inquiries.
51 diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
52 index 92361a2..95ffb9b 100644
59 -static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
61 -static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *,
63 +static void *rpcbproc_getaddr_3_local (void *, struct svc_req *, SVCXPRT *,
65 +static void *rpcbproc_dump_3_local (void *, struct svc_req *, SVCXPRT *,
69 * Called by svc_getreqset. There is a separate server handle for
70 @@ -74,7 +74,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
73 xdrproc_t xdr_argument, xdr_result;
74 - void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
75 + void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
76 rpcprog_t setprog = 0;
78 rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
79 diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
80 index f1a72a6..b6fc6a8 100644
81 --- a/src/rpcb_svc_4.c
82 +++ b/src/rpcb_svc_4.c
87 -static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
89 -static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
90 +static void *rpcbproc_getaddr_4_local (void *, struct svc_req *, SVCXPRT *,
92 +static void *rpcbproc_getversaddr_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
93 static void *rpcbproc_getaddrlist_4_local
94 - __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
95 -static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *));
96 -static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
97 + (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
98 +static void free_rpcb_entry_list (rpcb_entry_list_ptr *);
99 +static void *rpcbproc_dump_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
102 * Called by svc_getreqset. There is a separate server handle for
103 @@ -77,7 +77,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
106 xdrproc_t xdr_argument, xdr_result;
107 - void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
108 + void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
109 rpcprog_t setprog = 0;
111 rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
112 diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
113 index 9a094f5..0b556a2 100644
114 --- a/src/rpcb_svc_com.c
115 +++ b/src/rpcb_svc_com.c
116 @@ -99,29 +99,29 @@ struct finfo {
117 static struct finfo FINFO[NFORWARD];
120 -static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *));
121 -static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *));
122 -static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *));
123 -static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *));
124 -static int find_rmtcallfd_by_netid __P((char *));
125 -static SVCXPRT *find_rmtcallxprt_by_fd __P((int));
126 -static int forward_register __P((u_int32_t, struct netbuf *, int, char *,
127 - rpcproc_t, rpcvers_t, u_int32_t *));
128 -static struct finfo *forward_find __P((u_int32_t));
129 -static int free_slot_by_xid __P((u_int32_t));
130 -static int free_slot_by_index __P((int));
131 -static int netbufcmp __P((struct netbuf *, struct netbuf *));
132 -static struct netbuf *netbufdup __P((struct netbuf *));
133 -static void netbuffree __P((struct netbuf *));
134 -static int check_rmtcalls __P((struct pollfd *, int));
135 -static void xprt_set_caller __P((SVCXPRT *, struct finfo *));
136 -static void send_svcsyserr __P((SVCXPRT *, struct finfo *));
137 -static void handle_reply __P((int, SVCXPRT *));
138 -static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *));
139 -static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *));
140 -static char *getowner __P((SVCXPRT *, char *, size_t));
141 -static int add_pmaplist __P((RPCB *));
142 -static int del_pmaplist __P((RPCB *));
143 +static bool_t xdr_encap_parms (XDR *, struct encap_parms *);
144 +static bool_t xdr_rmtcall_args (XDR *, struct r_rmtcall_args *);
145 +static bool_t xdr_rmtcall_result (XDR *, struct r_rmtcall_args *);
146 +static bool_t xdr_opaque_parms (XDR *, struct r_rmtcall_args *);
147 +static int find_rmtcallfd_by_netid (char *);
148 +static SVCXPRT *find_rmtcallxprt_by_fd (int);
149 +static int forward_register (u_int32_t, struct netbuf *, int, char *,
150 + rpcproc_t, rpcvers_t, u_int32_t *);
151 +static struct finfo *forward_find (u_int32_t);
152 +static int free_slot_by_xid (u_int32_t);
153 +static int free_slot_by_index (int);
154 +static int netbufcmp (struct netbuf *, struct netbuf *);
155 +static struct netbuf *netbufdup (struct netbuf *);
156 +static void netbuffree (struct netbuf *);
157 +static int check_rmtcalls (struct pollfd *, int);
158 +static void xprt_set_caller (SVCXPRT *, struct finfo *);
159 +static void send_svcsyserr (SVCXPRT *, struct finfo *);
160 +static void handle_reply (int, SVCXPRT *);
161 +static void find_versions (rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
162 +static rpcblist_ptr find_service (rpcprog_t, rpcvers_t, char *);
163 +static char *getowner (SVCXPRT *, char *, size_t);
164 +static int add_pmaplist (RPCB *);
165 +static int del_pmaplist (RPCB *);
168 * Set a mapping of program, version, netid
169 diff --git a/src/rpcbind.c b/src/rpcbind.c
170 index 6d8bed2..63da6b2 100644
173 @@ -132,13 +132,13 @@ char *tcp_uaddr; /* Universal TCP address */
174 static char servname[] = "rpcbind";
175 static char superuser[] = "superuser";
177 -int main __P((int, char *[]));
178 +int main (int, char *[]);
180 -static int init_transport __P((struct netconfig *));
181 -static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *,
183 -static void terminate __P((int));
184 -static void parseargs __P((int, char *[]));
185 +static int init_transport (struct netconfig *);
186 +static void rbllist_add (rpcprog_t, rpcvers_t, struct netconfig *,
188 +static void terminate (int);
189 +static void parseargs (int, char *[]);
192 main(int argc, char *argv[])
193 diff --git a/src/util.c b/src/util.c
194 index a6c835b..ff9e1f4 100644
197 @@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
198 static struct sockaddr_in6 *local_in6;
201 -static int bitmaskcmp __P((void *, void *, void *, int));
202 +static int bitmaskcmp (void *, void *, void *, int);
205 * For all bits set in "mask", compare the corresponding bits in
206 diff --git a/src/warmstart.c b/src/warmstart.c
207 index b6eb73e..42dd3af 100644
208 --- a/src/warmstart.c
209 +++ b/src/warmstart.c
211 #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"
214 -static bool_t write_struct __P((char *, xdrproc_t, void *));
215 -static bool_t read_struct __P((char *, xdrproc_t, void *));
216 +static bool_t write_struct (char *, xdrproc_t, void *);
217 +static bool_t read_struct (char *, xdrproc_t, void *);
220 write_struct(char *filename, xdrproc_t structproc, void *list)