Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 444124 Details for
Bug 589666
net-nds/rpcbind-0.2.3-r1 patches to compile successfully on musl
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Remove the usage of the __P() GNU extension, removes extranous space
file_589666.txt (text/plain), 8.61 KB, created by
Daniel Kuehn (RETIRED)
on 2016-08-25 19:06:26 UTC
(
hide
)
Description:
Remove the usage of the __P() GNU extension, removes extranous space
Filename:
MIME Type:
Creator:
Daniel Kuehn (RETIRED)
Created:
2016-08-25 19:06:26 UTC
Size:
8.61 KB
patch
obsolete
>diff -Naurp src/check_bound.c src-musl/check_bound.c >--- src/check_bound.c 2016-07-05 17:37:51.187182739 +0000 >+++ src/check_bound.c 2016-07-05 17:47:33.678214455 +0000 >@@ -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 >diff -Naurp src/pmap_svc.c src-musl/pmap_svc.c >--- src/pmap_svc.c 2016-07-05 17:37:51.186182739 +0000 >+++ src/pmap_svc.c 2016-07-05 17:48:23.270217155 +0000 >@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1 > #include "rpcbind.h" > #include "xlog.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. >diff -Naurp src/rpcb_svc.c src-musl/rpcb_svc.c >--- src/rpcb_svc.c 2016-07-05 17:37:51.186182739 +0000 >+++ src/rpcb_svc.c 2016-07-05 17:49:06.996219536 +0000 >@@ -53,10 +53,10 @@ > #include "rpcbind.h" > #include "xlog.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 >@@ -75,7 +75,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); >diff -Naurp src/rpcb_svc_4.c src-musl/rpcb_svc_4.c >--- src/rpcb_svc_4.c 2016-07-05 17:37:51.185182739 +0000 >+++ src/rpcb_svc_4.c 2016-07-05 17:49:51.397221954 +0000 >@@ -54,13 +54,13 @@ > #include "rpcbind.h" > #include "xlog.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 >@@ -78,7 +78,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); >diff -Naurp src/rpcb_svc_com.c src-musl/rpcb_svc_com.c >--- src/rpcb_svc_com.c 2016-07-05 17:37:51.187182739 +0000 >+++ src/rpcb_svc_com.c 2016-07-05 17:51:18.693226707 +0000 >@@ -100,29 +100,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 >diff -Naurp src/rpcbind.c src-musl/rpcbind.c >--- src/rpcbind.c 2016-07-05 17:37:51.185182739 +0000 >+++ src/rpcbind.c 2016-07-05 17:52:11.533229584 +0000 >@@ -135,13 +135,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[]) >diff -Naurp src/util.c src-musl/util.c >--- src/util.c 2016-07-05 17:37:51.183182739 +0000 >+++ src/util.c 2016-07-05 17:52:31.357230663 +0000 >@@ -70,7 +70,7 @@ 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); > > /* > * For all bits set in "mask", compare the corresponding bits in >diff -Naurp src/warmstart.c src-musl/warmstart.c >--- src/warmstart.c 2016-07-05 17:37:51.183182739 +0000 >+++ src/warmstart.c 2016-07-05 17:52:43.467231323 +0000 >@@ -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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 589666
:
441504
|
441506
|
444122
| 444124 |
448918