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