diff options
| -rw-r--r-- | assuan/assuan-pipe-connect.c | 8 | ||||
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/posix-io.c | 2 | ||||
| -rw-r--r-- | gpgme/w32-glib-io.c | 2 | ||||
| -rw-r--r-- | gpgme/w32-io.c | 2 | ||||
| -rw-r--r-- | gpgme/w32-qt-io.cpp | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/assuan/assuan-pipe-connect.c b/assuan/assuan-pipe-connect.c index 1b6418f2..359eb494 100644 --- a/assuan/assuan-pipe-connect.c +++ b/assuan/assuan-pipe-connect.c @@ -571,7 +571,7 @@ pipe_connect_gpgme (assuan_context_t *ctx, { 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 @@ int rp[2]; 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 @@ build_w32_commandline (const char * const *argv, char **cmdline) #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) { diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 1988d581..ed8d8bd9 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2007-09-27 Marcus Brinkmann <[email protected]> + + * 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 <[email protected]> * conversion.c, keylist.c: Include <sys/types.h>. diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c index ca77cf46..947b6707 100644 --- a/gpgme/posix-io.c +++ b/gpgme/posix-io.c @@ -118,7 +118,7 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx) 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) diff --git a/gpgme/w32-glib-io.c b/gpgme/w32-glib-io.c index a0301b67..9d7eaf6c 100644 --- a/gpgme/w32-glib-io.c +++ b/gpgme/w32-glib-io.c @@ -221,7 +221,7 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx) 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) diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c index 9031ffb4..e83a2782 100644 --- a/gpgme/w32-io.c +++ b/gpgme/w32-io.c @@ -805,7 +805,7 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx) 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); diff --git a/gpgme/w32-qt-io.cpp b/gpgme/w32-qt-io.cpp index 989d9936..50c4a97a 100644 --- a/gpgme/w32-qt-io.cpp +++ b/gpgme/w32-qt-io.cpp @@ -194,7 +194,7 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx) 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) |