Module Name: src
Committed By: christos
Date: Tue Nov 10 20:56:20 UTC 2015
Modified Files:
src/lib/libc/rpc: rpc_soc.c svc_fdset.c svc_run.c svc_vc.c
Log Message:
fix compilation/lint
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/rpc/rpc_soc.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/rpc/svc_fdset.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/rpc/svc_run.c
cvs rdiff -u -r1.33 -r1.34 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/rpc_soc.c
diff -u src/lib/libc/rpc/rpc_soc.c:1.20 src/lib/libc/rpc/rpc_soc.c:1.21
--- src/lib/libc/rpc/rpc_soc.c:1.20 Tue Nov 10 13:01:16 2015
+++ src/lib/libc/rpc/rpc_soc.c Tue Nov 10 15:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_soc.c,v 1.20 2015/11/10 18:01:16 christos Exp $ */
+/* $NetBSD: rpc_soc.c,v 1.21 2015/11/10 20:56:20 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
#else
-__RCSID("$NetBSD: rpc_soc.c,v 1.20 2015/11/10 18:01:16 christos Exp $");
+__RCSID("$NetBSD: rpc_soc.c,v 1.21 2015/11/10 20:56:20 christos Exp $");
#endif
#endif
@@ -261,7 +261,6 @@ svc_com_create(int fd, u_int sendsize, u
(void) freenetconfigent(nconf);
if (svc == NULL)
goto out;
- }
port = (((struct sockaddr_in *)svc->xp_ltaddr.buf)->sin_port);
svc->xp_port = ntohs(port);
return svc;
Index: src/lib/libc/rpc/svc_fdset.c
diff -u src/lib/libc/rpc/svc_fdset.c:1.14 src/lib/libc/rpc/svc_fdset.c:1.15
--- src/lib/libc/rpc/svc_fdset.c:1.14 Tue Nov 10 13:11:05 2015
+++ src/lib/libc/rpc/svc_fdset.c Tue Nov 10 15:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_fdset.c,v 1.14 2015/11/10 18:11:05 christos Exp $ */
+/* $NetBSD: svc_fdset.c,v 1.15 2015/11/10 20:56:20 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: svc_fdset.c,v 1.14 2015/11/10 18:11:05 christos Exp $");
+__RCSID("$NetBSD: svc_fdset.c,v 1.15 2015/11/10 20:56:20 christos Exp $");
#include "reentrant.h"
@@ -146,7 +146,7 @@ svc_fdset_sanitize(struct svc_fdset *fds
#ifdef _LIBC
/* Compat update */
if (fds == &__svc_fdset) {
- svc_fdset = *(__fd_set_256 *)__svc_fdset.fdset;
+ svc_fdset = *(__fd_set_256 *)(void *)__svc_fdset.fdset;
svc_maxfd = __svc_fdset.fdmax;
}
#endif
Index: src/lib/libc/rpc/svc_run.c
diff -u src/lib/libc/rpc/svc_run.c:1.26 src/lib/libc/rpc/svc_run.c:1.27
--- src/lib/libc/rpc/svc_run.c:1.26 Tue Nov 10 13:06:53 2015
+++ src/lib/libc/rpc/svc_run.c Tue Nov 10 15:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_run.c,v 1.26 2015/11/10 18:06:53 christos Exp $ */
+/* $NetBSD: svc_run.c,v 1.27 2015/11/10 20:56:20 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
static char *sccsid = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_run.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc_run.c,v 1.26 2015/11/10 18:06:53 christos Exp $");
+__RCSID("$NetBSD: svc_run.c,v 1.27 2015/11/10 20:56:20 christos Exp $");
#endif
#endif
@@ -156,7 +156,7 @@ svc_run_poll(void)
goto out;
}
- if (pdf == NULL || fdsize != svc_pollfd_getsize(0)) {
+ if (pfd == NULL || fdsize != svc_pollfd_getsize(0)) {
fdsize = svc_fdset_getsize(0);
free(pfd);
pfd = svc_pollfd_copy(svc_pollfd_get());
@@ -169,7 +169,7 @@ svc_run_poll(void)
rwlock_unlock(&svc_fd_lock);
- switch ((i = poll(pfd, *maxfd, 30 * 1000))) {
+ switch ((i = poll(pfd, (size_t)*maxfd, 30 * 1000))) {
case -1:
#ifndef RUMP_RPC
if ((errno == EINTR || errno == EBADF) && probs < 100) {
Index: src/lib/libc/rpc/svc_vc.c
diff -u src/lib/libc/rpc/svc_vc.c:1.33 src/lib/libc/rpc/svc_vc.c:1.34
--- src/lib/libc/rpc/svc_vc.c:1.33 Sat Nov 7 18:09:20 2015
+++ src/lib/libc/rpc/svc_vc.c Tue Nov 10 15:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_vc.c,v 1.33 2015/11/07 23:09:20 christos Exp $ */
+/* $NetBSD: svc_vc.c,v 1.34 2015/11/10 20:56:20 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,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.33 2015/11/07 23:09:20 christos Exp $");
+__RCSID("$NetBSD: svc_vc.c,v 1.34 2015/11/10 20:56:20 christos Exp $");
#endif
#endif
@@ -756,6 +756,7 @@ svc_vc_rendezvous_ops(SVCXPRT *xprt)
* cleaned. If timeout is 0, the least active connection is picked.
*/
bool_t
+/*ARGSUSED1*/
__svc_clean_idle(fd_set *fds __unused, int timeout, bool_t cleanblock)
{
int i, ncleaned, *fdmax;
