[svn] gpgme - r1363 - trunk/src

[svn author marcus]

Author: marcus
Date: 2009-04-15 14:04:21 +0200 (Wed, 15 Apr 2009)
New Revision: 1363

Modified:
   trunk/src/ChangeLog
   trunk/src/posix-io.c
   trunk/src/w32-io.c
Log:
2009-04-15  Marcus Brinkmann  <marcus at g10code.de>

	* posix-io.c (_gpgme_io_socket, _gpgme_io_connect): New functions.
	* w32-io.c (_gpgme_io_connect): Fix stupid error.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-04-08 18:53:57 UTC (rev 1362)
+++ trunk/src/ChangeLog	2009-04-15 12:04:21 UTC (rev 1363)
@@ -1,3 +1,8 @@
+2009-04-15  Marcus Brinkmann  <marcus at g10code.de>
+
+	* posix-io.c (_gpgme_io_socket, _gpgme_io_connect): New functions.
+	* w32-io.c (_gpgme_io_connect): Fix stupid error.
+
 2009-04-08  Marcus Brinkmann  <marcus at g10code.de>
 
 	* w32-glib-io.c (giochannel_table): New members used, fd, socket.

Modified: trunk/src/posix-io.c
===================================================================
--- trunk/src/posix-io.c	2009-04-08 18:53:57 UTC (rev 1362)
+++ trunk/src/posix-io.c	2009-04-15 12:04:21 UTC (rev 1363)
@@ -653,3 +653,31 @@
 
   return new_fd;
 }
+
+
+int
+_gpgme_io_socket (int domain, int type, int proto)
+{
+  int res;
+
+  TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_socket", domain,
+	      "type=%i, proto=%i", type, proto);
+
+  res = socket (domain, type, proto);
+
+  return TRACE_SYSRES (res);
+}
+
+
+int
+_gpgme_io_connect (int fd, struct sockaddr *addr, int addrlen)
+{
+  int res;
+
+  TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_connect", fd,
+	      "addr=%p, addrlen=%i", addr, addrlen);
+
+  res = ath_connect (fd, addr, addrlen);
+
+  return TRACE_SYSRES (res);
+}

Modified: trunk/src/w32-io.c
===================================================================
--- trunk/src/w32-io.c	2009-04-08 18:53:57 UTC (rev 1362)
+++ trunk/src/w32-io.c	2009-04-15 12:04:21 UTC (rev 1363)
@@ -1514,13 +1514,12 @@
 int
 _gpgme_io_connect (int fd, struct sockaddr *addr, int addrlen)
 {
-  int sockfd;
   int res;
 
   TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_connect", fd,
 	      "addr=%p, addrlen=%i", addr, addrlen);
 
-  res = connect (sockfd, addr, addrlen);
+  res = connect (fd, addr, addrlen);
   if (!res)
     {
       errno = wsa2errno (WSAGetLastError ());