Module Name: src
Committed By: christos
Date: Fri Feb 4 17:36:55 UTC 2011
Modified Files:
src/lib/libc/rpc: svc_vc.c
Log Message:
knf - no functional changes
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/rpc/svc_vc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/svc_vc.c
diff -u src/lib/libc/rpc/svc_vc.c:1.22 src/lib/libc/rpc/svc_vc.c:1.23
--- src/lib/libc/rpc/svc_vc.c:1.22 Wed Feb 11 23:38:52 2009
+++ src/lib/libc/rpc/svc_vc.c Fri Feb 4 12:36:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_vc.c,v 1.22 2009/02/12 04:38:52 lukem Exp $ */
+/* $NetBSD: svc_vc.c,v 1.23 2011/02/04 17:36:54 christos Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc_vc.c,v 1.22 2009/02/12 04:38:52 lukem Exp $");
+__RCSID("$NetBSD: svc_vc.c,v 1.23 2011/02/04 17:36:54 christos Exp $");
#endif
#endif
@@ -79,23 +79,22 @@
extern rwlock_t svc_fd_lock;
#endif
-static SVCXPRT *makefd_xprt __P((int, u_int, u_int));
-static bool_t rendezvous_request __P((SVCXPRT *, struct rpc_msg *));
-static enum xprt_stat rendezvous_stat __P((SVCXPRT *));
-static void svc_vc_destroy __P((SVCXPRT *));
-static void __svc_vc_dodestroy __P((SVCXPRT *));
-static int read_vc __P((caddr_t, caddr_t, int));
-static int write_vc __P((caddr_t, caddr_t, int));
-static enum xprt_stat svc_vc_stat __P((SVCXPRT *));
-static bool_t svc_vc_recv __P((SVCXPRT *, struct rpc_msg *));
-static bool_t svc_vc_getargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static bool_t svc_vc_freeargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static bool_t svc_vc_reply __P((SVCXPRT *, struct rpc_msg *));
-static void svc_vc_rendezvous_ops __P((SVCXPRT *));
-static void svc_vc_ops __P((SVCXPRT *));
-static bool_t svc_vc_control __P((SVCXPRT *, const u_int, void *));
-static bool_t svc_vc_rendezvous_control __P((SVCXPRT *, const u_int,
- void *));
+static SVCXPRT *makefd_xprt(int, u_int, u_int);
+static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
+static enum xprt_stat rendezvous_stat(SVCXPRT *);
+static void svc_vc_destroy(SVCXPRT *);
+static void __svc_vc_dodestroy(SVCXPRT *);
+static int read_vc(caddr_t, caddr_t, int);
+static int write_vc(caddr_t, caddr_t, int);
+static enum xprt_stat svc_vc_stat(SVCXPRT *);
+static bool_t svc_vc_recv(SVCXPRT *, struct rpc_msg *);
+static bool_t svc_vc_getargs(SVCXPRT *, xdrproc_t, caddr_t);
+static bool_t svc_vc_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
+static bool_t svc_vc_reply(SVCXPRT *, struct rpc_msg *);
+static void svc_vc_rendezvous_ops(SVCXPRT *);
+static void svc_vc_ops(SVCXPRT *);
+static bool_t svc_vc_control(SVCXPRT *, const u_int, void *);
+static bool_t svc_vc_rendezvous_control(SVCXPRT *, const u_int, void *);
struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
u_int sendsize;
@@ -132,10 +131,7 @@
* 0 => use the system default.
*/
SVCXPRT *
-svc_vc_create(fd, sendsize, recvsize)
- int fd;
- u_int sendsize;
- u_int recvsize;
+svc_vc_create(int fd, u_int sendsize, u_int recvsize)
{
SVCXPRT *xprt;
struct cf_rendezvous *r = NULL;
@@ -192,13 +188,13 @@
xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
xprt_register(xprt);
- return (xprt);
+ return xprt;
cleanup_svc_vc_create:
if (xprt)
mem_free(xprt, sizeof(*xprt));
if (r != NULL)
mem_free(r, sizeof(*r));
- return (NULL);
+ return NULL;
}
/*
@@ -206,10 +202,7 @@
* descriptor as its first input.
*/
SVCXPRT *
-svc_fd_create(fd, sendsize, recvsize)
- int fd;
- u_int sendsize;
- u_int recvsize;
+svc_fd_create(int fd, u_int sendsize, u_int recvsize)
{
struct sockaddr_storage ss;
socklen_t slen;
@@ -263,10 +256,7 @@
}
static SVCXPRT *
-makefd_xprt(fd, sendsize, recvsize)
- int fd;
- u_int sendsize;
- u_int recvsize;
+makefd_xprt(int fd, u_int sendsize, u_int recvsize)
{
SVCXPRT *xprt;
struct cf_conn *cd;
@@ -295,7 +285,7 @@
goto out;
xprt_register(xprt);
- return (xprt);
+ return xprt;
out:
warn("svc_tcp: makefd_xprt");
if (xprt)
@@ -305,9 +295,7 @@
/*ARGSUSED*/
static bool_t
-rendezvous_request(xprt, msg)
- SVCXPRT *xprt;
- struct rpc_msg *msg;
+rendezvous_request(SVCXPRT *xprt, struct rpc_msg *msg)
{
int sock, flags;
struct cf_rendezvous *r;
@@ -337,7 +325,7 @@
if (__svc_clean_idle(&cleanfds, 0, FALSE))
goto again;
}
- return (FALSE);
+ return FALSE;
}
/*
* make a new transporter (re-uses xprt)
@@ -380,24 +368,22 @@
(void)gettimeofday(&cd->last_recv_time, NULL);
- return (FALSE); /* there is never an rpc msg to be processed */
+ return FALSE; /* there is never an rpc msg to be processed */
out:
(void)close(sock);
- return (FALSE); /* there was an error */
+ return FALSE; /* there was an error */
}
/*ARGSUSED*/
static enum xprt_stat
-rendezvous_stat(xprt)
- SVCXPRT *xprt;
+rendezvous_stat(SVCXPRT *xprt)
{
- return (XPRT_IDLE);
+ return XPRT_IDLE;
}
static void
-svc_vc_destroy(xprt)
- SVCXPRT *xprt;
+svc_vc_destroy(SVCXPRT *xprt)
{
_DIAGASSERT(xprt != NULL);
@@ -406,8 +392,7 @@
}
static void
-__svc_vc_dodestroy(xprt)
- SVCXPRT *xprt;
+__svc_vc_dodestroy(SVCXPRT *xprt)
{
struct cf_conn *cd;
struct cf_rendezvous *r;
@@ -439,26 +424,20 @@
/*ARGSUSED*/
static bool_t
-svc_vc_control(xprt, rq, in)
- SVCXPRT *xprt;
- const u_int rq;
- void *in;
+svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in)
{
- return (FALSE);
+ return FALSE;
}
/*ARGSUSED*/
static bool_t
-svc_vc_rendezvous_control(xprt, rq, in)
- SVCXPRT *xprt;
- const u_int rq;
- void *in;
+svc_vc_rendezvous_control(SVCXPRT *xprt, const u_int rq, void *in)
{
struct cf_rendezvous *cfp;
cfp = (struct cf_rendezvous *)xprt->xp_p1;
if (cfp == NULL)
- return (FALSE);
+ return FALSE;
switch (rq) {
case SVCGET_CONNMAXREC:
*(int *)in = cfp->maxrec;
@@ -467,9 +446,9 @@
cfp->maxrec = *(int *)in;
break;
default:
- return (FALSE);
+ return FALSE;
}
- return (TRUE);
+ return TRUE;
}
/*
@@ -480,10 +459,7 @@
* fatal for the connection.
*/
static int
-read_vc(xprtp, buf, len)
- caddr_t xprtp;
- caddr_t buf;
- int len;
+read_vc(caddr_t xprtp, caddr_t buf, int len)
{
SVCXPRT *xprt;
int sock;
@@ -571,14 +547,14 @@
if ((len = read(sock, buf, (size_t)len)) > 0) {
gettimeofday(&cfp->last_recv_time, NULL);
- return (len);
+ return len;
}
fatal_err:
if (crmsg != NULL)
free(crmsg);
((struct cf_conn *)(xprt->xp_p1))->strm_stat = XPRT_DIED;
- return (-1);
+ return -1;
}
/*
@@ -586,10 +562,7 @@
* Any error is fatal and the connection is closed.
*/
static int
-write_vc(xprtp, buf, len)
- caddr_t xprtp;
- caddr_t buf;
- int len;
+write_vc(caddr_t xprtp, caddr_t buf, int len)
{
SVCXPRT *xprt;
int i, cnt;
@@ -608,7 +581,7 @@
if ((i = write(xprt->xp_fd, buf, (size_t)cnt)) < 0) {
if (errno != EAGAIN || !cd->nonblock) {
cd->strm_stat = XPRT_DIED;
- return (-1);
+ return -1;
}
if (cd->nonblock && i != cnt) {
/*
@@ -621,17 +594,16 @@
gettimeofday(&tv1, NULL);
if (tv1.tv_sec - tv0.tv_sec >= 2) {
cd->strm_stat = XPRT_DIED;
- return (-1);
+ return -1;
}
}
}
}
- return (len);
+ return len;
}
static enum xprt_stat
-svc_vc_stat(xprt)
- SVCXPRT *xprt;
+svc_vc_stat(SVCXPRT *xprt)
{
struct cf_conn *cd;
@@ -640,16 +612,14 @@
cd = (struct cf_conn *)(xprt->xp_p1);
if (cd->strm_stat == XPRT_DIED)
- return (XPRT_DIED);
+ return XPRT_DIED;
if (! xdrrec_eof(&(cd->xdrs)))
- return (XPRT_MOREREQS);
- return (XPRT_IDLE);
+ return XPRT_MOREREQS;
+ return XPRT_IDLE;
}
static bool_t
-svc_vc_recv(xprt, msg)
- SVCXPRT *xprt;
- struct rpc_msg *msg;
+svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg)
{
struct cf_conn *cd;
XDR *xdrs;
@@ -670,31 +640,25 @@
if (xdr_callmsg(xdrs, msg)) {
cd->x_id = msg->rm_xid;
- return (TRUE);
+ return TRUE;
}
cd->strm_stat = XPRT_DIED;
- return (FALSE);
+ return FALSE;
}
static bool_t
-svc_vc_getargs(xprt, xdr_args, args_ptr)
- SVCXPRT *xprt;
- xdrproc_t xdr_args;
- caddr_t args_ptr;
+svc_vc_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
{
_DIAGASSERT(xprt != NULL);
/* args_ptr may be NULL */
- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
- args_ptr));
+ return (*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
+ args_ptr);
}
static bool_t
-svc_vc_freeargs(xprt, xdr_args, args_ptr)
- SVCXPRT *xprt;
- xdrproc_t xdr_args;
- caddr_t args_ptr;
+svc_vc_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
{
XDR *xdrs;
@@ -704,13 +668,11 @@
xdrs = &(((struct cf_conn *)(xprt->xp_p1))->xdrs);
xdrs->x_op = XDR_FREE;
- return ((*xdr_args)(xdrs, args_ptr));
+ return (*xdr_args)(xdrs, args_ptr);
}
static bool_t
-svc_vc_reply(xprt, msg)
- SVCXPRT *xprt;
- struct rpc_msg *msg;
+svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg)
{
struct cf_conn *cd;
XDR *xdrs;
@@ -726,12 +688,11 @@
msg->rm_xid = cd->x_id;
rstat = xdr_replymsg(xdrs, msg);
(void)xdrrec_endofrecord(xdrs, TRUE);
- return (rstat);
+ return rstat;
}
static void
-svc_vc_ops(xprt)
- SVCXPRT *xprt;
+svc_vc_ops(SVCXPRT *xprt)
{
static struct xp_ops ops;
static struct xp_ops2 ops2;
@@ -765,21 +726,16 @@
#ifdef _REENTRANT
extern mutex_t ops_lock;
#endif
-/* XXXGCC vax compiler unhappy otherwise */
-#ifdef __vax__
-extern void abort(void);
-#endif
-
mutex_lock(&ops_lock);
if (ops.xp_recv == NULL) {
ops.xp_recv = rendezvous_request;
ops.xp_stat = rendezvous_stat;
ops.xp_getargs =
- (bool_t (*) __P((SVCXPRT *, xdrproc_t, caddr_t)))abort;
+ (bool_t (*)(SVCXPRT *, xdrproc_t, caddr_t))abort;
ops.xp_reply =
- (bool_t (*) __P((SVCXPRT *, struct rpc_msg *)))abort;
+ (bool_t (*)(SVCXPRT *, struct rpc_msg *))abort;
ops.xp_freeargs =
- (bool_t (*) __P((SVCXPRT *, xdrproc_t, caddr_t)))abort;
+ (bool_t (*)(SVCXPRT *, xdrproc_t, caddr_t))abort;
ops.xp_destroy = svc_vc_destroy;
ops2.xp_control = svc_vc_rendezvous_control;
}
