Module Name: src
Committed By: joerg
Date: Fri Nov 6 23:05:09 UTC 2015
Modified Files:
src/lib/libc/rpc: rpc_commondata.c svc_fdset.c
Log Message:
Don't use macros as types or variable names.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/rpc/rpc_commondata.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/rpc/svc_fdset.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_commondata.c
diff -u src/lib/libc/rpc/rpc_commondata.c:1.9 src/lib/libc/rpc/rpc_commondata.c:1.10
--- src/lib/libc/rpc/rpc_commondata.c:1.9 Mon Mar 11 20:19:29 2013
+++ src/lib/libc/rpc/rpc_commondata.c Fri Nov 6 23:05:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_commondata.c,v 1.9 2013/03/11 20:19:29 tron Exp $ */
+/* $NetBSD: rpc_commondata.c,v 1.10 2015/11/06 23:05:09 joerg Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -31,12 +31,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#define SVC_LEGACY
+
#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.9 2013/03/11 20:19:29 tron Exp $");
+__RCSID("$NetBSD: rpc_commondata.c,v 1.10 2015/11/06 23:05:09 joerg Exp $");
#endif
#endif
Index: src/lib/libc/rpc/svc_fdset.c
diff -u src/lib/libc/rpc/svc_fdset.c:1.2 src/lib/libc/rpc/svc_fdset.c:1.3
--- src/lib/libc/rpc/svc_fdset.c:1.2 Fri Nov 6 19:34:13 2015
+++ src/lib/libc/rpc/svc_fdset.c Fri Nov 6 23:05:09 2015
@@ -1,7 +1,7 @@
-/* $NetBSD: svc_fdset.c,v 1.2 2015/11/06 19:34:13 christos Exp $ */
+/* $NetBSD: svc_fdset.c,v 1.3 2015/11/06 23:05:09 joerg Exp $ */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: svc_fdset.c,v 1.2 2015/11/06 19:34:13 christos Exp $");
+__RCSID("$NetBSD: svc_fdset.c,v 1.3 2015/11/06 23:05:09 joerg Exp $");
#include "reentrant.h"
@@ -13,7 +13,7 @@ __RCSID("$NetBSD: svc_fdset.c,v 1.2 2015
#include <stdlib.h>
#include <string.h>
-struct svc_fdset {
+struct my_svc_fdset {
fd_set *fdset;
int fdmax;
int fdsize;
@@ -96,7 +96,7 @@ svc_print(const char *func, size_t line,
static void
svc_fdset_free(void *v)
{
- struct svc_fdset *rv = v;
+ struct my_svc_fdset *rv = v;
DPRINTF_FDSET(rv->fdset, 0, "free");
free(rv->fdset);
@@ -133,10 +133,10 @@ svc_fdset_resize(int fd, fd_set **fdset,
return *fdset;
}
-static struct svc_fdset *
+static struct my_svc_fdset *
svc_fdset_alloc(int fd)
{
- struct svc_fdset *rv;
+ struct my_svc_fdset *rv;
if (fdsetkey == -1)
thr_keycreate(&fdsetkey, svc_fdset_free);
@@ -172,7 +172,7 @@ svc_fdset_alloc(int fd)
static fd_set *
svc_fdset_get_internal(int fd)
{
- struct svc_fdset *rv;
+ struct my_svc_fdset *rv;
if (!__isthreaded || fdsetkey == -2)
return svc_fdset_resize(fd, &__svc_fdset, &svc_fdsize);
@@ -270,7 +270,7 @@ svc_fdset_get(void)
int *
svc_fdset_getmax(void)
{
- struct svc_fdset *rv;
+ struct my_svc_fdset *rv;
if (!__isthreaded || fdsetkey == -2)
return &svc_maxfd;
@@ -284,7 +284,7 @@ svc_fdset_getmax(void)
int
svc_fdset_getsize(int fd)
{
- struct svc_fdset *rv;
+ struct my_svc_fdset *rv;
if (!__isthreaded || fdsetkey == -2) {
if (svc_fdset_resize(fd, &__svc_fdset, &svc_fdsize) == NULL)
