Page MenuHomeFreeBSD
Files F157466147

D54940.id170765.diff
No OneTemporary
Actions

D54940.id170765.diff
View Options

diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -64,6 +64,8 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
+typedef bool_t (*clnt_broadcast_resultproc_t)(caddr_t, struct sockaddr_in *);
+
extern bool_t pmap_set(u_long, u_long, int, int);
extern bool_t pmap_unset(u_long, u_long);
extern struct pmaplist *pmap_getmaps(struct sockaddr_in *);
@@ -75,7 +77,7 @@
extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long,
xdrproc_t, void *,
xdrproc_t, void *,
- resultproc_t);
+ clnt_broadcast_resultproc_t);
extern u_short pmap_getport(struct sockaddr_in *,
u_long, u_long, u_int);
__END_DECLS
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -310,7 +310,7 @@
* Support the earlier calling style of the callback function with a
* per-thread temporary copy of the real callback.
*/
-static _Thread_local resultproc_t clnt_broadcast_result;
+static _Thread_local clnt_broadcast_resultproc_t clnt_broadcast_result;
/*
* Need to translate the netbuf address into sockaddr_in address.
@@ -336,7 +336,8 @@
*/
enum clnt_stat
clnt_broadcast(u_long prog, u_long vers, u_long proc, xdrproc_t xargs,
- void *argsp, xdrproc_t xresults, void *resultsp, resultproc_t eachresult)
+ void *argsp, xdrproc_t xresults, void *resultsp,
+ clnt_broadcast_resultproc_t eachresult)
/*
* u_long prog; // program number
* u_long vers; // version number
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -206,7 +206,7 @@
clnt_stat = clnt_broadcast(RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS,
(xdrproc_t)xdr_void, NULL,
(xdrproc_t)xdr_statstime, &host_stat,
- (resultproc_t)rstat_reply);
+ (clnt_broadcast_resultproc_t)rstat_reply);
if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT)
errx(1, "%s", clnt_sperrno(clnt_stat));
}
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -208,7 +208,7 @@
clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE,
RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL,
(xdrproc_t)xdr_utmpidlearr, (char *)&up,
- (resultproc_t)rusers_reply);
+ (clnt_broadcast_resultproc_t)rusers_reply);
if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT)
errx(1, "%s", clnt_sperrno(clnt_stat));
}
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -111,7 +111,7 @@
(char *)&whoami_arg,
(xdrproc_t)xdr_bp_whoami_res,
(char *)&stat_whoami_res,
- (resultproc_t)eachres_whoami);
+ (clnt_broadcast_resultproc_t)eachres_whoami);
exit(0);
}
@@ -134,7 +134,7 @@
(char *)&getfile_arg,
(xdrproc_t)xdr_bp_getfile_res,
(char *)&stat_getfile_res,
- (resultproc_t)eachres_getfile);
+ (clnt_broadcast_resultproc_t)eachres_getfile);
exit(0);
}
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -748,7 +748,7 @@
stat = clnt_broadcast(YPPROG, YPVERS, YPPROC_DOMAIN_NONACK,
(xdrproc_t)xdr_domainname, &ptr,
(xdrproc_t)xdr_bool, &out,
- (resultproc_t)broadcast_result);
+ (clnt_broadcast_resultproc_t)broadcast_result);
}
if (stat != RPC_SUCCESS) {

File Metadata

Mime Type
text/plain
Expires
Fri, May 22, 6:48 PM (14 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33427763
Default Alt Text
D54940.id170765.diff (3 KB)

Event Timeline