diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-03 18:37:19 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-03 18:37:19 +0200 |
commit | 671f50958c0cdeebb528df0e8c54a281eaddf9dd (patch) | |
tree | a53e5e7ef8a40e7571940f54446ae818e590f37c /lib/locks.c | |
parent | 539776d5e5e6725024e5ba619c48980b089f3415 (diff) | |
download | gnutls-671f50958c0cdeebb528df0e8c54a281eaddf9dd.tar.gz |
Locks were converted to be in align with posix locks to easier wrap around them.
Diffstat (limited to 'lib/locks.c')
-rw-r--r-- | lib/locks.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/lib/locks.c b/lib/locks.c index 7875119fb0..30ffd5302e 100644 --- a/lib/locks.c +++ b/lib/locks.c @@ -51,21 +51,23 @@ static int gnutls_system_mutex_init (void **priv) return 0; } -static void gnutls_system_mutex_deinit (void *priv) +static int gnutls_system_mutex_deinit (void **priv) { - DeleteCriticalSection(priv); - free(priv); + DeleteCriticalSection((CRITICAL_SECTION*)*priv); + free(*priv); + + return 0; } -static int gnutls_system_mutex_lock (void *priv) +static int gnutls_system_mutex_lock (void **priv) { - EnterCriticalSection(priv); + EnterCriticalSection((CRITICAL_SECTION*)*priv); return 0; } -static int gnutls_system_mutex_unlock (void *priv) +static int gnutls_system_mutex_unlock (void **priv) { - LeaveCriticalSection(priv); + LeaveCriticalSection((CRITICAL_SECTION*)*priv); return 0; } @@ -101,15 +103,16 @@ static int gnutls_system_mutex_init (void **priv) return 0; } -static void gnutls_system_mutex_deinit (void *priv) +static int gnutls_system_mutex_deinit (void **priv) { - pthread_mutex_destroy(priv); - free(priv); + pthread_mutex_destroy((pthread_mutex_t*)*priv); + free(*priv); + return 0; } -static int gnutls_system_mutex_lock (void *priv) +static int gnutls_system_mutex_lock (void **priv) { - if (pthread_mutex_lock(priv)) + if (pthread_mutex_lock((pthread_mutex_t*)*priv)) { gnutls_assert(); return GNUTLS_E_LOCKING_ERROR; @@ -118,9 +121,9 @@ static int gnutls_system_mutex_lock (void *priv) return 0; } -static int gnutls_system_mutex_unlock (void *priv) +static int gnutls_system_mutex_unlock (void **priv) { - if (pthread_mutex_unlock(priv)) + if (pthread_mutex_unlock((pthread_mutex_t*)*priv)) { gnutls_assert(); return GNUTLS_E_LOCKING_ERROR; @@ -143,17 +146,17 @@ static int gnutls_system_mutex_init (void **priv) return 0; } -static void gnutls_system_mutex_deinit (void *priv) +static int gnutls_system_mutex_deinit (void **priv) { - return; + return 0; } -static int gnutls_system_mutex_lock (void *priv) +static int gnutls_system_mutex_lock (void **priv) { return 0; } -static int gnutls_system_mutex_unlock (void *priv) +static int gnutls_system_mutex_unlock (void **priv) { return 0; } |