 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_commondata.c,v 1.13 2015/11/07 14:21:32 christos Exp $	*/
+/*	$NetBSD: rpc_commondata.c,v 1.14 2015/11/08 02:46:53 christos Exp $	*/
 /*
  * Copyright (c) 2010, Oracle America, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  *       copyright notice, this list of conditions and the following
  *       disclaimer in the documentation and/or other materials
 @@ -26,33 +26,35 @@
  *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: rpc_commondata.c,v 1.13 2015/11/07 14:21:32 christos Exp $");
+__RCSID("$NetBSD: rpc_commondata.c,v 1.14 2015/11/08 02:46:53 christos Exp $");
 #endif
 #endif
 #include <rpc/rpc.h>
 #include "svc_fdset.h"
 /*
  * This file should only contain common data (global data) that is exported
  * by public interfaces
  */
 struct opaque_auth _null_auth;
 #ifdef _LIBC
 #undef svc_fdset
 __fd_set_256 svc_fdset;
 #undef svc_maxfd
 int svc_maxfd = -1;
 #endif
 #ifndef _REENTRANT
 #undef rpc_createerr
 struct rpc_createerr rpc_createerr;
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svc_fdset.c,v 1.10 2015/11/07 23:17:09 christos Exp $	*/
+/*	$NetBSD: svc_fdset.c,v 1.11 2015/11/08 02:46:53 christos Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,50 +20,52 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: svc_fdset.c,v 1.10 2015/11/07 23:17:09 christos Exp $");
+__RCSID("$NetBSD: svc_fdset.c,v 1.11 2015/11/08 02:46:53 christos Exp $");
 #include "reentrant.h"
 #include <sys/fd_set.h>
 #include <rpc/rpc.h>
 #ifdef FDSET_DEBUG
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <lwp.h>
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <poll.h>
 #include "svc_fdset.h"
 #undef svc_fdset
 #undef svc_maxfd
 #ifdef _LIBC
 extern __fd_set_256 svc_fdset;
 #endif
 extern int svc_maxfd;
 int __svc_flags;
 struct svc_fdset {
 	/* select */
 	fd_set *fdset;
 	int	fdmax;
 	int	fdsize;
 	/* poll */
 	struct pollfd *fdp;
 	int	fdnum;
 	int	fdused;
 };
 @@ -122,31 +124,33 @@ svc_print(const char *func, size_t line,
 #else
 #define DPRINTF(...)
 #define DPRINTF_FDSET(...)
 #endif
 static inline void
 svc_fdset_sanitize(struct svc_fdset *fds)
+{
 	while (fds->fdmax >= 0 && !FD_ISSET(fds->fdmax, fds->fdset))
 		fds->fdmax--;
 #ifdef _LIBC
 	/* Compat update */
 	if (fds == &__svc_fdset) {
 		svc_fdset = *(__fd_set_256 *)__svc_fdset.fdset;
 		svc_maxfd = __svc_fdset.fdmax;
+	}
 #endif
+}
 static void
 svc_fdset_free(void *v)
+{
 	struct svc_fdset *fds = v;
 	DPRINTF_FDSET(fds, "free");
 	free(fds->fdp);
 	free(fds->fdset);
 	free(fds);
+}

 @@ -1,22 +1,24 @@
-/*	$NetBSD: svc_fdset.h,v 1.3 2015/11/07 00:42:04 christos Exp $	*/
+/*	$NetBSD: svc_fdset.h,v 1.4 2015/11/08 02:46:53 christos Exp $	*/
 # ifdef RUMP_RPC
 #  include <rump/rump.h>
 #  include <rump/rump_syscalls.h>
 #  undef	close
 #  define	close(a)		rump_sys_close(a)
 #  undef	fcntl
 #  define	fcntl(a, b, c)		rump_sys_fcntl(a, b, c)
 #  undef	read
 #  define	read(a, b, c)		rump_sys_read(a, b, c)
 #  undef	write
 #  define	write(a, b, c)		rump_sys_write(a, b, c)
 #  undef	pollts
 #  define	pollts(a, b, c, d)	rump_sys_pollts(a, b, c, d)
 #  undef	select
 #  define	select(a, b, c, d, e)	rump_sys_select(a, b, c, d, e)
 # endif
 #ifdef _LIBC
 typedef struct __fd_set_256 {
 	__fd_mask fds_bits[__NFD_LEN(256)];
 } __fd_set_256;
 #endif