[svn] GnuPG - r5216 - trunk/common

[svn author marcus]

Author: marcus
Date: 2009-12-08 05:09:36 +0100 (Tue, 08 Dec 2009)
New Revision: 5216

Modified:
   trunk/common/ChangeLog
   trunk/common/asshelp.c
   trunk/common/iobuf.c
Log:
2009-12-08  Marcus Brinkmann  <marcus at g10code.de>

	* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
	argument in assuan_socket_connect invocation.
	* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
	declaration.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2009-12-07 17:12:28 UTC (rev 5215)
+++ trunk/common/ChangeLog	2009-12-08 04:09:36 UTC (rev 5216)
@@ -1,3 +1,10 @@
+2009-12-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
+	argument in assuan_socket_connect invocation.
+	* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
+	declaration.
+
 2009-12-07  Werner Koch  <wk at g10code.com>
 
 	* pka.c (get_pka_info): Add support for ADNS.

Modified: trunk/common/asshelp.c
===================================================================
--- trunk/common/asshelp.c	2009-12-07 17:12:28 UTC (rev 5215)
+++ trunk/common/asshelp.c	2009-12-08 04:09:36 UTC (rev 5216)
@@ -247,7 +247,7 @@
                 /* Give the agent some time to prepare itself. */
                 gnupg_sleep (3);
                 /* Now try again to connect the agent.  */
-                rc = assuan_socket_connect (ctx, sockname, 0);
+                rc = assuan_socket_connect (ctx, sockname, 0, 0);
               }
           }
 #else /*!HAVE_W32_SYSTEM*/

Modified: trunk/common/iobuf.c
===================================================================
--- trunk/common/iobuf.c	2009-12-07 17:12:28 UTC (rev 5215)
+++ trunk/common/iobuf.c	2009-12-08 04:09:36 UTC (rev 5216)
@@ -1266,7 +1266,7 @@
    "rb" if FNAME is used.  In contrast to iobuf_fdopen the file
    descriptor FD will not be closed during an iobuf_close.  */
 iobuf_t
-iobuf_open_fd_or_name (int fd, const char *fname, const char *mode)
+iobuf_open_fd_or_name (gnupg_fd_t fd, const char *fname, const char *mode)
 {
   iobuf_t a;