Deleted Added
full compact
37c37
< __FBSDID("$FreeBSD: head/lib/libc/rpc/svc.c 95658 2002-04-28 15:18:50Z des $");
---
> __FBSDID("$FreeBSD: head/lib/libc/rpc/svc.c 109359 2003-01-16 07:13:51Z mbr $");
66,67d65
< static SVCXPRT **xports;
<
93a92
> static void __xprt_do_unregister (SVCXPRT *xprt, bool_t dolock);
111,112c110,111
< if (xports == NULL) {
< xports = (SVCXPRT **)
---
> if (__svc_xports == NULL) {
> __svc_xports = (SVCXPRT **)
114c113
< if (xports == NULL)
---
> if (__svc_xports == NULL)
116c115
< memset(xports, '\0', FD_SETSIZE * sizeof(SVCXPRT *));
---
> memset(__svc_xports, '\0', FD_SETSIZE * sizeof(SVCXPRT *));
119c118
< xports[sock] = xprt;
---
> __svc_xports[sock] = xprt;
125a125,136
> void
> xprt_unregister(SVCXPRT *xprt)
> {
> __xprt_do_unregister(xprt, TRUE);
> }
>
> void
> __xprt_unregister_unlocked(SVCXPRT *xprt)
> {
> __xprt_do_unregister(xprt, FALSE);
> }
>
129,130c140,141
< void
< xprt_unregister(xprt)
---
> static void
> __xprt_do_unregister(xprt, dolock)
131a143
> bool_t dolock;
139,141c151,154
< rwlock_wrlock(&svc_fd_lock);
< if ((sock < FD_SETSIZE) && (xports[sock] == xprt)) {
< xports[sock] = NULL;
---
> if (dolock)
> rwlock_wrlock(&svc_fd_lock);
> if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) {
> __svc_xports[sock] = NULL;
145c158
< if (xports[svc_maxfd])
---
> if (__svc_xports[svc_maxfd])
149c162,163
< rwlock_unlock(&svc_fd_lock);
---
> if (dolock)
> rwlock_unlock(&svc_fd_lock);
614c628
< xprt = xports[fd];
---
> xprt = __svc_xports[fd];
670c684
< if (xprt != xports[fd]) {
---
> if (xprt != __svc_xports[fd]) {
717a732,752
>
> bool_t
> rpc_control(int what, void *arg)
> {
> int val;
>
> switch (what) {
> case RPC_SVC_CONNMAXREC_SET:
> val = *(int *)arg;
> if (val <= 0)
> return FALSE;
> __svc_maxrec = val;
> return TRUE;
> case RPC_SVC_CONNMAXREC_GET:
> *(int *)arg = __svc_maxrec;
> return TRUE;
> default:
> break;
> }
> return FALSE;
> }