From 946b5841c22c4b050513ecf6d5a01bd521b05673 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 29 Feb 2012 15:47:16 -0500
Subject: Clean up lingering _identifiers.

---
 evthread_win32.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'evthread_win32.c')

diff --git a/evthread_win32.c b/evthread_win32.c
index 743a876b..a0eedcbd 100644
--- a/evthread_win32.c
+++ b/evthread_win32.c
@@ -60,17 +60,17 @@ evthread_win32_lock_create(unsigned locktype)
 }
 
 static void
-evthread_win32_lock_free(void *_lock, unsigned locktype)
+evthread_win32_lock_free(void *lock_, unsigned locktype)
 {
-	CRITICAL_SECTION *lock = _lock;
+	CRITICAL_SECTION *lock = lock_;
 	DeleteCriticalSection(lock);
 	mm_free(lock);
 }
 
 static int
-evthread_win32_lock(unsigned mode, void *_lock)
+evthread_win32_lock(unsigned mode, void *lock_)
 {
-	CRITICAL_SECTION *lock = _lock;
+	CRITICAL_SECTION *lock = lock_;
 	if ((mode & EVTHREAD_TRY)) {
 		return ! TryEnterCriticalSection(lock);
 	} else {
@@ -80,9 +80,9 @@ evthread_win32_lock(unsigned mode, void *_lock)
 }
 
 static int
-evthread_win32_unlock(unsigned mode, void *_lock)
+evthread_win32_unlock(unsigned mode, void *lock_)
 {
-	CRITICAL_SECTION *lock = _lock;
+	CRITICAL_SECTION *lock = lock_;
 	LeaveCriticalSection(lock);
 	return 0;
 }
@@ -134,17 +134,17 @@ evthread_win32_condvar_alloc(unsigned condflags)
 }
 
 static void
-evthread_win32_condvar_free(void *_cond)
+evthread_win32_condvar_free(void *cond_)
 {
-	CONDITION_VARIABLE *cond = _cond;
+	CONDITION_VARIABLE *cond = cond_;
 	/* There doesn't _seem_ to be a cleaup fn here... */
 	mm_free(cond);
 }
 
 static int
-evthread_win32_condvar_signal(void *_cond, int broadcast)
+evthread_win32_condvar_signal(void *cond, int broadcast)
 {
-	CONDITION_VARIABLE *cond = _cond;
+	CONDITION_VARIABLE *cond = cond_;
 	if (broadcast)
 		WakeAllConditionVariable_fn(cond);
 	else
@@ -153,10 +153,10 @@ evthread_win32_condvar_signal(void *_cond, int broadcast)
 }
 
 static int
-evthread_win32_condvar_wait(void *_cond, void *_lock, const struct timeval *tv)
+evthread_win32_condvar_wait(void *cond_, void *lock_, const struct timeval *tv)
 {
-	CONDITION_VARIABLE *cond = _cond;
-	CRITICAL_SECTION *lock = _lock;
+	CONDITION_VARIABLE *cond = cond_;
+	CRITICAL_SECTION *lock = lock_;
 	DWORD ms, err;
 	BOOL result;
 
@@ -205,18 +205,18 @@ evthread_win32_cond_alloc(unsigned flags)
 }
 
 static void
-evthread_win32_cond_free(void *_cond)
+evthread_win32_cond_free(void *cond_)
 {
-	struct evthread_win32_cond *cond = _cond;
+	struct evthread_win32_cond *cond = cond_;
 	DeleteCriticalSection(&cond->lock);
 	CloseHandle(cond->event);
 	mm_free(cond);
 }
 
 static int
-evthread_win32_cond_signal(void *_cond, int broadcast)
+evthread_win32_cond_signal(void *cond_, int broadcast)
 {
-	struct evthread_win32_cond *cond = _cond;
+	struct evthread_win32_cond *cond = cond_;
 	EnterCriticalSection(&cond->lock);
 	if (broadcast)
 		cond->n_to_wake = cond->n_waiting;
@@ -229,10 +229,10 @@ evthread_win32_cond_signal(void *_cond, int broadcast)
 }
 
 static int
-evthread_win32_cond_wait(void *_cond, void *_lock, const struct timeval *tv)
+evthread_win32_cond_wait(void *cond_, void *lock_, const struct timeval *tv)
 {
-	struct evthread_win32_cond *cond = _cond;
-	CRITICAL_SECTION *lock = _lock;
+	struct evthread_win32_cond *cond = cond_;
+	CRITICAL_SECTION *lock = lock_;
 	int generation_at_start;
 	int waiting = 1;
 	int result = -1;
-- 
cgit v1.2.1