diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/assuan-socket.c | 16 | ||||
| -rw-r--r-- | src/assuan.h | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b38307..7b43bef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-09-25 Werner Koch <[email protected]> + + * assuan.h (_assuan_gpg_strerror_r, _assuan_gpg_strsource): Add + wrappers for these new internal functions. + 2007-09-24 Marcus Brinkmann <[email protected]> * assuan-uds.c (uds_reader) [HAVE_W32_SYSTEM]: Do not touch the @@ -10,6 +15,10 @@ ctx->pid as handle. (pipe_connect_w32): Save the spawned processes handle. +2007-09-13 Werner Koch <[email protected]> + + * assuan-socket.c (_assuan_close): Add inactive debug outputs. + 2007-09-11 Marcus Brinkmann <[email protected]> * assuan.h: Use _WIN32 instead of HAVE_W32_SYSTEM. diff --git a/src/assuan-socket.c b/src/assuan-socket.c index 1a7827d..13f4e77 100644 --- a/src/assuan-socket.c +++ b/src/assuan-socket.c @@ -43,13 +43,21 @@ int _assuan_close (assuan_fd_t fd) { -#ifndef HAVE_W32_SYSTEM - return close (fd); -#else +#ifdef HAVE_W32_SYSTEM int rc = closesocket (HANDLE2SOCKET(fd)); +/* if (rc) */ +/* _assuan_log_printf ("_assuan_close(%p): closesocket failed: %d/%ld\n", */ +/* fd, rc, WSAGetLastError ()); */ if (rc && WSAGetLastError () == WSAENOTSOCK) - rc = CloseHandle (fd); + { + rc = CloseHandle (fd); +/* if (rc) */ +/* _assuan_log_printf ("_assuan_close(%p): CloseHandle failed: %d\n", */ +/* fd, rc ); */ + } return rc; +#else + return close (fd); #endif } diff --git a/src/assuan.h b/src/assuan.h index a625334..788a742 100644 --- a/src/assuan.h +++ b/src/assuan.h @@ -159,6 +159,8 @@ #define _assuan_set_default_log_stream \ _ASSUAN_PREFIX(_assuan_set_default_log_stream) #define _assuan_w32_strerror _ASSUAN_PREFIX(_assuan_w32_strerror) +#define _assuan_gpg_strerror_r _ASSUAN_PREFIX(_assuan_gpg_strerror_r) +#define _assuan_gpg_strsource _ASSUAN_PREFIX(_assuan_gpg_strsource) #define _assuan_write_line _ASSUAN_PREFIX(_assuan_write_line) #define _assuan_close _ASSUAN_PREFIX(_assuan_close) #define _assuan_sock_new _ASSUAN_PREFIX(_assuan_sock_new) |