Module Name: src
Committed By: pooka
Date: Sun Apr 26 22:26:59 UTC 2009
Modified Files:
src/sys/rump/librump/rumpuser: rumpuser_pth.c
Log Message:
avoid namespace collision. no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/librump/rumpuser/rumpuser_pth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpuser/rumpuser_pth.c
diff -u src/sys/rump/librump/rumpuser/rumpuser_pth.c:1.31 src/sys/rump/librump/rumpuser/rumpuser_pth.c:1.32
--- src/sys/rump/librump/rumpuser/rumpuser_pth.c:1.31 Mon Mar 23 11:48:32 2009
+++ src/sys/rump/librump/rumpuser/rumpuser_pth.c Sun Apr 26 22:26:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_pth.c,v 1.31 2009/03/23 11:48:32 pooka Exp $ */
+/* $NetBSD: rumpuser_pth.c,v 1.32 2009/04/26 22:26:59 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_pth.c,v 1.31 2009/03/23 11:48:32 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_pth.c,v 1.32 2009/04/26 22:26:59 pooka Exp $");
#endif /* !lint */
#ifdef __linux__
@@ -313,10 +313,10 @@
}
void
-rumpuser_rw_enter(struct rumpuser_rw *rw, int write)
+rumpuser_rw_enter(struct rumpuser_rw *rw, int iswrite)
{
- if (write) {
+ if (iswrite) {
KLOCK_WRAP(NOFAIL_ERRNO(pthread_rwlock_wrlock(&rw->pthrw)));
RURW_SETWRITE(rw);
} else {
@@ -326,11 +326,11 @@
}
int
-rumpuser_rw_tryenter(struct rumpuser_rw *rw, int write)
+rumpuser_rw_tryenter(struct rumpuser_rw *rw, int iswrite)
{
int rv;
- if (write) {
+ if (iswrite) {
rv = pthread_rwlock_trywrlock(&rw->pthrw);
if (rv == 0)
RURW_SETWRITE(rw);
