 @@ -1,14 +1,14 @@
-/*	$NetBSD: svc.h,v 1.27 2015/11/06 19:42:57 christos Exp $	*/
+/*	$NetBSD: svc.h,v 1.28 2015/11/07 16:58:24 christos Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -306,28 +306,28 @@ extern fd_set svc_fdset;
  */
 __BEGIN_DECLS
 extern void rpctest_service(void);
 __END_DECLS
 __BEGIN_DECLS
 #define SVC_FDSET_MT	1
 extern void	svc_fdset_init(int);
 extern fd_set  *svc_fdset_copy(const fd_set *);
 extern void	svc_fdset_zero(void);
 extern int	svc_fdset_isset(int);
-extern void	svc_fdset_clr(int);
+extern int	svc_fdset_clr(int);
-extern void	svc_fdset_set(int);
+extern int	svc_fdset_set(int);
 extern fd_set  *svc_fdset_get(void);
 extern int	svc_fdset_getsize(int);
 extern int     *svc_fdset_getmax(void);
 extern void	svc_getreq	(int);
 extern void	svc_getreqset	(fd_set *);
 extern void	svc_getreqset2	(fd_set *, int);
 extern void	svc_getreq_common	(int);
 struct pollfd;
 extern void	svc_getreq_poll(struct pollfd *, int);
 extern void	svc_run		(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svc_fdset.c,v 1.6 2015/11/07 03:06:32 christos Exp $	*/
+/*	$NetBSD: svc_fdset.c,v 1.7 2015/11/07 16:58:24 christos Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights resefdsed.
+ *
  * 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,27 +20,27 @@
  * ``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.6 2015/11/07 03:06:32 christos Exp $");
+__RCSID("$NetBSD: svc_fdset.c,v 1.7 2015/11/07 16:58:24 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>
 @@ -209,88 +209,108 @@ svc_fdset_init(int flags)
 	if ((flags & SVC_FDSET_MT) && fdsetkey == -2)
 		fdsetkey = -1;
+}
 void
 svc_fdset_zero(void)
+{
 	DPRINTF("zero");
 	struct svc_fdset *fds = svc_fdset_alloc(0);
 	memset(fds->fdset, 0, fds->fdsize);
 	fds->fdmax = -1;
+}
-void
+int
 svc_fdset_set(int fd)
+{
 	struct svc_fdset *fds = svc_fdset_alloc(fd);
 	if (fds == NULL)
 		return -1;
 	FD_SET(fd, fds->fdset);
 	if (fd > fds->fdmax)
 		fds->fdmax = fd;
 	DPRINTF_FDSET(fds, "%d", fd);
 	svc_fdset_sanitize(fds);
 	return 0;
+}
 int
 svc_fdset_isset(int fd)
+{
 	struct svc_fdset *fds = svc_fdset_alloc(fd);
 	if (fds == NULL)
 		return -1;
 	DPRINTF_FDSET(fds, "%d", fd);
-	return FD_ISSET(fd, fds->fdset);
+	return FD_ISSET(fd, fds->fdset) != 0;
+}
-void
+int
 svc_fdset_clr(int fd)
+{
 	struct svc_fdset *fds = svc_fdset_alloc(fd);
 	if (fds == NULL)
 		return -1;
 	FD_CLR(fd, fds->fdset);
 	DPRINTF_FDSET(fds, "%d", fd);
 	svc_fdset_sanitize(fds);
 	return 0;
+}
 fd_set *
 svc_fdset_copy(const fd_set *orig)
+{
 	int size = svc_fdset_getsize(0);
 	fd_set *copy = calloc(1, __NFD_BYTES(size));
 	if (copy == NULL)
 		return NULL;
 	if (orig)
 		memcpy(copy, orig, __NFD_BYTES(size));
 	return copy;
+}
 fd_set *
 svc_fdset_get(void)
+{
 	struct svc_fdset *fds = svc_fdset_alloc(0);
 	if (fds == NULL)
 		return NULL;
 	DPRINTF_FDSET(fds, "get");
 	svc_fdset_sanitize(fds);
 	return fds->fdset;
+}
 int *
 svc_fdset_getmax(void)
+{
 	struct svc_fdset *fds = svc_fdset_alloc(0);
 	if (fds == NULL)
 		return NULL;
 	DPRINTF_FDSET(fds, "getmax");
 	svc_fdset_sanitize(fds);
 	return &fds->fdmax;
+}
 int
 svc_fdset_getsize(int fd)
+{
 	struct svc_fdset *fds = svc_fdset_alloc(fd);
 	if (fds == NULL)
 		return -1;
 	DPRINTF_FDSET(fds, "getsize");
 	return fds->fdsize;
+}