From ce484b9aaff7331a36da08b6d9b42740d232c72d Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 1 Nov 2010 16:23:33 +0000 Subject: 2010-11-01 Marcus Brinkmann * configure.ac: Check for fcntl.h. 2010-11-01 Marcus Brinkmann * assuan-socket.c, assuan-uds.c, system.c, assuan-pipe-server.c, assuan-pipe-connect.c [!HAVE_FCNTL_H]: Don't include fcntl.h. * assuan-buffer.c [!HAVE_W32CE_SYSTEM]: Do not include process.h. * assuan-socket.c [!HAVE_W32CE_SYSTEM]: Do not include io.h. * w32-includes.inc.h: Include winsock2.h before ws2tcpip.h. * sysutils.c (w32_read_registry): Replace goto label "leave" by "out" (as leave is defined by some Windows header file). * assuan-inquire.c: Likewise. --- src/sysutils.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/sysutils.c') diff --git a/src/sysutils.c b/src/sysutils.c index 578e47d..5a1d9de 100644 --- a/src/sysutils.c +++ b/src/sysutils.c @@ -70,33 +70,33 @@ w32_read_registry (const wchar_t *dir, const wchar_t *name) nbytes = 1; if (RegQueryValueEx (handle, name, 0, NULL, NULL, &nbytes)) - goto leave; + goto out; buffer = malloc ((n=nbytes+2)); if (!buffer) - goto leave; + goto out; if (RegQueryValueEx (handle, name, 0, NULL, (PBYTE)buffer, &n)) { free (buffer); buffer = NULL; - goto leave; + goto out; } n = WideCharToMultiByte (CP_UTF8, 0, buffer, nbytes, NULL, 0, NULL, NULL); if (n < 0 || (n+1) <= 0) - goto leave; + goto out; result = malloc (n+1); if (!result) - goto leave; + goto out; n = WideCharToMultiByte (CP_UTF8, 0, buffer, nbytes, result, n, NULL, NULL); if (n < 0) { free (result); result = NULL; - goto leave; + goto out; } result[n] = 0; - leave: + out: free (buffer); RegCloseKey (handle); return result; -- cgit v1.2.3