[svn] gpgme - r1344 - in trunk: assuan gpgme
svn author marcus
cvs at cvs.gnupg.org
Thu Oct 30 16:08:45 CET 2008
Author: marcus
Date: 2008-10-30 16:08:44 +0100 (Thu, 30 Oct 2008)
New Revision: 1344
Modified:
trunk/assuan/ChangeLog
trunk/assuan/assuan-pipe-connect.c
trunk/gpgme/ChangeLog
trunk/gpgme/posix-io.c
trunk/gpgme/priv-io.h
trunk/gpgme/w32-io.c
trunk/gpgme/wait-global.c
trunk/gpgme/wait-private.c
trunk/gpgme/wait-user.c
Log:
assuan/
2008-10-30 Marcus Brinkmann <marcus at g10code.de>
* assuan-pipe-connect.c: Fix prototype for _gpgme_io_spawn. Cast
second argument in its invocation to silence gcc warning.
gpgme/
2008-10-30 Marcus Brinkmann <marcus at g10code.de>
* wait-private.c (_gpgme_wait_on_condition): Remove unused
variable IDX.
* wait-global.c: Include ops.h to silence gcc warning.
(_gpgme_wait_global_event_cb): Pass error value directly.
* wait-user.c: Include ops.h to silence gcc warning.
* posix-io.c (_gpgme_io_spawn): Make ARGV argument const to
silence gcc warning. Cast argument to execv to silence warning.
* w32-io.c (_gpgme_io_spawn): Likewise.
* priv-io.h (_gpgme_io_spawn): Likewise for prototype.
Modified: trunk/assuan/ChangeLog
===================================================================
--- trunk/assuan/ChangeLog 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/assuan/ChangeLog 2008-10-30 15:08:44 UTC (rev 1344)
@@ -1,3 +1,8 @@
+2008-10-30 Marcus Brinkmann <marcus at g10code.de>
+
+ * assuan-pipe-connect.c: Fix prototype for _gpgme_io_spawn. Cast
+ second argument in its invocation to silence gcc warning.
+
2008-06-25 Marcus Brinkmann <marcus at g10code.de>
* assuan-pipe-connect.c (struct spawn_fd_item_s): Add new members.
Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/ChangeLog 2008-10-30 15:08:44 UTC (rev 1344)
@@ -1,3 +1,16 @@
+2008-10-30 Marcus Brinkmann <marcus at g10code.de>
+
+ * wait-private.c (_gpgme_wait_on_condition): Remove unused
+ variable IDX.
+ * wait-global.c: Include ops.h to silence gcc warning.
+ (_gpgme_wait_global_event_cb): Pass error value directly.
+ * wait-user.c: Include ops.h to silence gcc warning.
+
+ * posix-io.c (_gpgme_io_spawn): Make ARGV argument const to
+ silence gcc warning. Cast argument to execv to silence warning.
+ * w32-io.c (_gpgme_io_spawn): Likewise.
+ * priv-io.h (_gpgme_io_spawn): Likewise for prototype.
+
2008-10-24 Werner Koch <wk at g10code.com>
* rungpg.c (gpg_keylist_preprocess): Escape backslashes too.
Modified: trunk/assuan/assuan-pipe-connect.c
===================================================================
--- trunk/assuan/assuan-pipe-connect.c 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/assuan/assuan-pipe-connect.c 2008-10-30 15:08:44 UTC (rev 1344)
@@ -52,7 +52,7 @@
int _gpgme_io_pipe (int filedes[2], int inherit_idx);
-int _gpgme_io_spawn (const char *path, char **argv,
+int _gpgme_io_spawn (const char *path, char *const argv[],
struct spawn_fd_item_s *fd_list, pid_t *r_pid);
#endif
@@ -665,7 +665,7 @@
child_fds[nr].dup_to = -1;
/* Start the process. */
- res = _gpgme_io_spawn (name, argv, child_fds, NULL);
+ res = _gpgme_io_spawn (name, (char *const *) argv, child_fds, NULL);
if (res == -1)
{
_assuan_log_printf ("CreateProcess failed: %s\n", strerror (errno));
Modified: trunk/gpgme/posix-io.c
===================================================================
--- trunk/gpgme/posix-io.c 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/posix-io.c 2008-10-30 15:08:44 UTC (rev 1344)
@@ -304,7 +304,7 @@
/* Returns 0 on success, -1 on error. */
int
-_gpgme_io_spawn (const char *path, char **argv,
+_gpgme_io_spawn (const char *path, char *const argv[],
struct spawn_fd_item_s *fd_list, pid_t *r_pid)
{
pid_t pid;
@@ -427,7 +427,7 @@
close (fd);
}
- execv (path, argv);
+ execv (path, (char *const *) argv);
/* Hmm: in that case we could write a special status code to the
status-pipe. */
#if 0
Modified: trunk/gpgme/priv-io.h
===================================================================
--- trunk/gpgme/priv-io.h 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/priv-io.h 2008-10-30 15:08:44 UTC (rev 1344)
@@ -63,7 +63,7 @@
close all fds except for those in FD_LIST in the child, then
optionally dup() the child fds. Finally, all fds in the list are
closed in the parent. */
-int _gpgme_io_spawn (const char *path, char **argv,
+int _gpgme_io_spawn (const char *path, char *const argv[],
struct spawn_fd_item_s *fd_list, pid_t *r_pid);
int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock);
Modified: trunk/gpgme/w32-io.c
===================================================================
--- trunk/gpgme/w32-io.c 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/w32-io.c 2008-10-30 15:08:44 UTC (rev 1344)
@@ -1009,7 +1009,7 @@
int
-_gpgme_io_spawn (const char *path, char **argv,
+_gpgme_io_spawn (const char *path, char *const argv[],
struct spawn_fd_item_s *fd_list, pid_t *r_pid)
{
SECURITY_ATTRIBUTES sec_attr;
Modified: trunk/gpgme/wait-global.c
===================================================================
--- trunk/gpgme/wait-global.c 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/wait-global.c 2008-10-30 15:08:44 UTC (rev 1344)
@@ -33,6 +33,7 @@
#include "context.h"
#include "wait.h"
#include "priv-io.h"
+#include "ops.h"
/* The global event loop is used for all asynchronous operations
(except key listing) for which no user I/O callbacks are specified.
@@ -202,7 +203,7 @@
if (err)
/* An error occured. Close all fds in this context, and
send the error in a done event. */
- _gpgme_cancel_with_err (ctx, &err);
+ _gpgme_cancel_with_err (ctx, err);
}
break;
Modified: trunk/gpgme/wait-private.c
===================================================================
--- trunk/gpgme/wait-private.c 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/wait-private.c 2008-10-30 15:08:44 UTC (rev 1344)
@@ -86,8 +86,6 @@
{
/* An error occured. Close all fds in this context, and
signal it. */
- unsigned int idx;
-
err = gpg_error_from_errno (errno);
_gpgme_cancel_with_err (ctx, err);
Modified: trunk/gpgme/wait-user.c
===================================================================
--- trunk/gpgme/wait-user.c 2008-10-30 14:41:23 UTC (rev 1343)
+++ trunk/gpgme/wait-user.c 2008-10-30 15:08:44 UTC (rev 1344)
@@ -28,6 +28,7 @@
#include "context.h"
#include "priv-io.h"
#include "wait.h"
+#include "ops.h"
/* The user event loops are used for all asynchronous operations for
More information about the Gnupg-commits
mailing list