diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-06-18 22:31:08 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-06-18 22:31:08 +0000 |
commit | c5e98d887b0475b0091ed2a9d4cbe2276e8ff387 (patch) | |
tree | 02ee7fb06e26439df97dcee31533172d9e08fc2d /locks/win32/thread_rwlock.c | |
parent | c0ca872ea29778ba1e61e10884a6fc8bea418261 (diff) | |
download | libapr-c5e98d887b0475b0091ed2a9d4cbe2276e8ff387.tar.gz |
Clean up a style issue; apr_get_os_error() is much cleaner.
Note that the result from WaitFor{*}() calls is a rather
special case, since it has other interesting details. These
were not touched since they are clearer as-is.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64542 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks/win32/thread_rwlock.c')
-rw-r--r-- | locks/win32/thread_rwlock.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/locks/win32/thread_rwlock.c b/locks/win32/thread_rwlock.c index 0eda1d9b9..f5671ddbe 100644 --- a/locks/win32/thread_rwlock.c +++ b/locks/win32/thread_rwlock.c @@ -74,13 +74,13 @@ APR_DECLARE(apr_status_t)apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock, if (! ((*rwlock)->read_event = CreateEvent(NULL, TRUE, FALSE, NULL))) { *rwlock = NULL; - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); } if (! ((*rwlock)->write_mutex = CreateMutex(NULL, FALSE, NULL))) { CloseHandle((*rwlock)->read_event); *rwlock = NULL; - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); } apr_pool_cleanup_register(pool, *rwlock, thread_rwlock_cleanup, @@ -104,10 +104,10 @@ static apr_status_t apr_thread_rwlock_rdlock_core(apr_thread_rwlock_t *rwlock, InterlockedIncrement(&rwlock->readers); if (! ResetEvent(rwlock->read_event)) - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); if (! ReleaseMutex(rwlock->write_mutex)) - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); return APR_SUCCESS; } @@ -145,7 +145,7 @@ apr_thread_rwlock_wrlock_core(apr_thread_rwlock_t *rwlock, DWORD milliseconds) if (code == WAIT_FAILED || code == WAIT_TIMEOUT) { /* Unable to wait for readers to finish, release write lock: */ if (! ReleaseMutex(rwlock->write_mutex)) - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); return APR_FROM_OS_ERROR(code); } @@ -166,34 +166,34 @@ APR_DECLARE(apr_status_t)apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock) { - DWORD code = 0; + apr_status_t rv = 0; /* First, guess that we're unlocking a writer */ if (! ReleaseMutex(rwlock->write_mutex)) - code = GetLastError(); + rv = apr_get_os_error(); - if (code == ERROR_NOT_OWNER) { + if (rv == APR_FROM_OS_ERROR(ERROR_NOT_OWNER)) { /* Nope, we must have a read lock */ if (rwlock->readers && ! InterlockedDecrement(&rwlock->readers) && ! SetEvent(rwlock->read_event)) { - code = GetLastError(); + rv = apr_get_os_error(); } else { - code = 0; + rv = 0; } } - return APR_FROM_OS_ERROR(code); + return rv; } APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock) { if (! CloseHandle(rwlock->read_event)) - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); if (! CloseHandle(rwlock->write_mutex)) - return APR_FROM_OS_ERROR(GetLastError()); + return apr_get_os_error(); return APR_SUCCESS; } |