[svn] gpgme - r1263 - in trunk: assuan gpgme

[svn author marcus]

Author: marcus
Date: 2007-09-27 13:44:45 +0200 (Thu, 27 Sep 2007)
New Revision: 1263

Modified:
   trunk/assuan/assuan-pipe-connect.c
   trunk/gpgme/ChangeLog
   trunk/gpgme/posix-io.c
   trunk/gpgme/w32-glib-io.c
   trunk/gpgme/w32-io.c
   trunk/gpgme/w32-qt-io.cpp
Log:
2007-09-27  Marcus Brinkmann  <marcus at g10code.de>

	* assuan-pipe-connect.c (pipe_connect_gpgme): Fix last change.

gpgme/
2007-09-27  Marcus Brinkmann  <marcus at g10code.de>

	* w32-glib-io.c (_gpgme_io_pipe), w32-qt-io.c (_gpgme_io_pipe),
	w32-io.c (_gpgme_io_pipe), posix-io.c (_gpgme_io_pipe): Fix debug
	output.


Modified: trunk/assuan/assuan-pipe-connect.c
===================================================================
--- trunk/assuan/assuan-pipe-connect.c	2007-09-27 11:06:23 UTC (rev 1262)
+++ trunk/assuan/assuan-pipe-connect.c	2007-09-27 11:44:45 UTC (rev 1263)
@@ -571,7 +571,7 @@
 {
   assuan_error_t err;
   int pid;
-int rp[2];
+  int rp[2];
   int wp[2];
   char mypidstr[50];
   struct spawn_fd_item_s child_fds[3]; /* stdin, stdout, terminating -1 */
@@ -586,10 +586,10 @@
   sprintf (mypidstr, "%lu", (unsigned long)getpid ());
 
   /* Create the two pipes. */
-  if (_gpgme_io_pipe (rp, 0))
+  if (_gpgme_io_pipe (rp, 1))
     return _assuan_error (ASSUAN_General_Error);
   
-  if (_gpgme_io_pipe (wp, 1))
+  if (_gpgme_io_pipe (wp, 0))
     {
       _gpgme_io_close (rp[0]);
       _gpgme_io_close (rp[1]);
@@ -706,7 +706,7 @@
 
 
 #ifdef HAVE_W32_SYSTEM
-/* Create pipe where one end end is inheritable.  */
+/* Create pipe where one end is inheritable.  */
 static int
 create_inheritable_pipe (int filedes[2], int for_write)
 {

Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-09-27 11:06:23 UTC (rev 1262)
+++ trunk/gpgme/ChangeLog	2007-09-27 11:44:45 UTC (rev 1263)
@@ -1,3 +1,9 @@
+2007-09-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* w32-glib-io.c (_gpgme_io_pipe), w32-qt-io.c (_gpgme_io_pipe),
+	w32-io.c (_gpgme_io_pipe), posix-io.c (_gpgme_io_pipe): Fix debug
+	output.
+
 2007-09-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* conversion.c, keylist.c: Include <sys/types.h>.

Modified: trunk/gpgme/posix-io.c
===================================================================
--- trunk/gpgme/posix-io.c	2007-09-27 11:06:23 UTC (rev 1262)
+++ trunk/gpgme/posix-io.c	2007-09-27 11:44:45 UTC (rev 1263)
@@ -118,7 +118,7 @@
   int err;
   TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_pipe", filedes,
 	      "inherit_idx=%i (GPGME uses it for %s)",
-	      inherit_idx, inherit_idx ? "writing" : "reading");
+	      inherit_idx, inherit_idx ? "reading" : "writing");
 
   err = pipe (filedes);
   if (err < 0)

Modified: trunk/gpgme/w32-glib-io.c
===================================================================
--- trunk/gpgme/w32-glib-io.c	2007-09-27 11:06:23 UTC (rev 1262)
+++ trunk/gpgme/w32-glib-io.c	2007-09-27 11:44:45 UTC (rev 1263)
@@ -221,7 +221,7 @@
   GIOChannel *chan;
   TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_pipe", filedes,
 	      "inherit_idx=%i (GPGME uses it for %s)",
-	      inherit_idx, inherit_idx ? "writing" : "reading");
+	      inherit_idx, inherit_idx ? "reading" : "writing");
 
 #define PIPEBUF_SIZE  4096
   if (_pipe (filedes, PIPEBUF_SIZE, O_NOINHERIT | O_BINARY) == -1)

Modified: trunk/gpgme/w32-io.c
===================================================================
--- trunk/gpgme/w32-io.c	2007-09-27 11:06:23 UTC (rev 1262)
+++ trunk/gpgme/w32-io.c	2007-09-27 11:44:45 UTC (rev 1263)
@@ -805,7 +805,7 @@
   SECURITY_ATTRIBUTES sec_attr;
   TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_pipe", filedes,
 	      "inherit_idx=%i (GPGME uses it for %s)",
-	      inherit_idx, inherit_idx ? "writing" : "reading");
+	      inherit_idx, inherit_idx ? "reading" : "writing");
 
   memset (&sec_attr, 0, sizeof (sec_attr));
   sec_attr.nLength = sizeof (sec_attr);

Modified: trunk/gpgme/w32-qt-io.cpp
===================================================================
--- trunk/gpgme/w32-qt-io.cpp	2007-09-27 11:06:23 UTC (rev 1262)
+++ trunk/gpgme/w32-qt-io.cpp	2007-09-27 11:44:45 UTC (rev 1263)
@@ -194,7 +194,7 @@
   QIODevice *chan;
   TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_pipe", filedes,
 	      "inherit_idx=%i (GPGME uses it for %s)",
-	      inherit_idx, inherit_idx ? "writing" : "reading");
+	      inherit_idx, inherit_idx ? "reading" : "writing");
 
 #define PIPEBUF_SIZE  4096
   if (_pipe (filedes, PIPEBUF_SIZE, O_NOINHERIT | O_BINARY) == -1)