diff options
Diffstat (limited to 'lib/system.c')
| -rw-r--r-- | lib/system.c | 162 |
1 files changed, 94 insertions, 68 deletions
diff --git a/lib/system.c b/lib/system.c index ec05590992..0f393c311c 100644 --- a/lib/system.c +++ b/lib/system.c @@ -29,12 +29,12 @@ #include <errno.h> #ifdef _WIN32 -# include <windows.h> +#include <windows.h> #else -# ifdef HAVE_PTHREAD_LOCKS -# include <pthread.h> -# endif +#ifdef HAVE_PTHREAD_LOCKS +#include <pthread.h> +#endif #endif /* We need to disable gnulib's replacement wrappers to get native @@ -49,52 +49,60 @@ */ #ifdef _WIN32 -int system_errno(gnutls_transport_ptr) +int +system_errno (gnutls_transport_ptr) { int tmperr = WSAGetLastError (); int ret = 0; switch (tmperr) { - case WSAEWOULDBLOCK: - ret = EAGAIN; - break; - case WSAEINTR: - ret = EINTR; - break; - default: - ret = EIO; - break; - } - WSASetLastError (tmperr); + case WSAEWOULDBLOCK: + ret = EAGAIN; + break; + case WSAEINTR: + ret = EINTR; + break; + default: + ret = EIO; + break; + } + WSASetLastError (tmperr); return ret; } -ssize_t system_write(gnutls_transport_ptr ptr, const void* data, size_t data_size) +ssize_t +system_write (gnutls_transport_ptr ptr, const void *data, size_t data_size) { - return send( GNUTLS_POINTER_TO_INT(ptr), data, data_size, 0); + return send (GNUTLS_POINTER_TO_INT (ptr), data, data_size, 0); } #else /* POSIX */ -int system_errno(gnutls_transport_ptr ptr) +int +system_errno (gnutls_transport_ptr ptr) { return errno; } -ssize_t system_writev(gnutls_transport_ptr ptr, const giovec_t * iovec, int iovec_cnt) +ssize_t +system_writev (gnutls_transport_ptr ptr, const giovec_t * iovec, + int iovec_cnt) { - return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec*) iovec, iovec_cnt); + return writev (GNUTLS_POINTER_TO_INT (ptr), (struct iovec *) iovec, + iovec_cnt); } #endif -ssize_t system_read(gnutls_transport_ptr ptr, void* data, size_t data_size) +ssize_t +system_read (gnutls_transport_ptr ptr, void *data, size_t data_size) { - return recv( GNUTLS_POINTER_TO_INT(ptr), data, data_size, 0); + return recv (GNUTLS_POINTER_TO_INT (ptr), data, data_size, 0); } -ssize_t system_read_peek(gnutls_transport_ptr ptr, void* data, size_t data_size) +ssize_t +system_read_peek (gnutls_transport_ptr ptr, void *data, size_t data_size) { - return recv( GNUTLS_POINTER_TO_INT(ptr), data, data_size, MSG_PEEK); + return recv (GNUTLS_POINTER_TO_INT (ptr), data, data_size, MSG_PEEK); } /* Thread stuff */ @@ -103,42 +111,48 @@ ssize_t system_read_peek(gnutls_transport_ptr ptr, void* data, size_t data_size) /* FIXME: win32 locks are untested */ -static int gnutls_system_mutex_init (void **priv) +static int +gnutls_system_mutex_init (void **priv) { CRITICAL_SECTION *lock = malloc (sizeof (CRITICAL_SECTION)); int ret; - if (lock==NULL) + if (lock == NULL) return GNUTLS_E_MEMORY_ERROR; - InitializeCriticalSection(lock); - + InitializeCriticalSection (lock); + *priv = lock; - + return 0; } -static int gnutls_system_mutex_deinit (void **priv) +static int +gnutls_system_mutex_deinit (void **priv) { - DeleteCriticalSection((CRITICAL_SECTION*)*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((CRITICAL_SECTION*)*priv); + EnterCriticalSection ((CRITICAL_SECTION *) * priv); return 0; } -static int gnutls_system_mutex_unlock (void **priv) +static int +gnutls_system_mutex_unlock (void **priv) { - LeaveCriticalSection((CRITICAL_SECTION*)*priv); + LeaveCriticalSection ((CRITICAL_SECTION *) * priv); return 0; } -int _gnutls_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) +int +_gnutls_atfork (void (*prepare) (void), void (*parent) (void), + void (*child) (void)) { return 0; } @@ -148,86 +162,98 @@ int _gnutls_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(vo #ifdef HAVE_PTHREAD_LOCKS -static int gnutls_system_mutex_init (void **priv) +static int +gnutls_system_mutex_init (void **priv) { pthread_mutex_t *lock = malloc (sizeof (pthread_mutex_t)); int ret; - if (lock==NULL) + if (lock == NULL) return GNUTLS_E_MEMORY_ERROR; - ret = pthread_mutex_init (lock, NULL); - if (ret) - { - free(lock); - gnutls_assert(); - return GNUTLS_E_LOCKING_ERROR; - } - + ret = pthread_mutex_init (lock, NULL); + if (ret) + { + free (lock); + gnutls_assert (); + return GNUTLS_E_LOCKING_ERROR; + } + *priv = lock; - + return 0; } -static int gnutls_system_mutex_deinit (void **priv) +static int +gnutls_system_mutex_deinit (void **priv) { - pthread_mutex_destroy((pthread_mutex_t*)*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((pthread_mutex_t*)*priv)) + if (pthread_mutex_lock ((pthread_mutex_t *) * priv)) { - gnutls_assert(); - return GNUTLS_E_LOCKING_ERROR; + gnutls_assert (); + return GNUTLS_E_LOCKING_ERROR; } return 0; } -static int gnutls_system_mutex_unlock (void **priv) +static int +gnutls_system_mutex_unlock (void **priv) { - if (pthread_mutex_unlock((pthread_mutex_t*)*priv)) + if (pthread_mutex_unlock ((pthread_mutex_t *) * priv)) { - gnutls_assert(); - return GNUTLS_E_LOCKING_ERROR; + gnutls_assert (); + return GNUTLS_E_LOCKING_ERROR; } return 0; } -int _gnutls_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) +int +_gnutls_atfork (void (*prepare) (void), void (*parent) (void), + void (*child) (void)) { - return pthread_atfork(prepare, parent, child); + return pthread_atfork (prepare, parent, child); } #endif /* PTHREAD_LOCKS */ #ifdef HAVE_NO_LOCKS -static int gnutls_system_mutex_init (void **priv) +static int +gnutls_system_mutex_init (void **priv) { return 0; } -static int gnutls_system_mutex_deinit (void **priv) +static int +gnutls_system_mutex_deinit (void **priv) { 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; } -int _gnutls_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) +int +_gnutls_atfork (void (*prepare) (void), void (*parent) (void), + void (*child) (void)) { return 0; } |