2009-10-30 Marcus Brinkmann <[email protected]>

	* configure.ac: Check for argp.h and error_t.

src/
2009-10-30  Marcus Brinkmann  <[email protected]>

	* Makefile.am (noinst_PROGRAMS): New target gpgme-tool.
	(gpgme_tool_LDADD): New variable.
	* gpgme-tool.c: New file.
	* ops.h (_gpgme_sig_notation_clearm _gpgme_signers_clear): New
	prototypes.
	* gpgme.c (gpgme_set_protocol): Allow GPGME_PROTOCOL_GPGCONF (when
	had that gone missing?).
	(_gpgme_sig_notation_clear): New function without debug output.
	(gpgme_release): Call it and _gpgme_signers_clear.
	* signers.c (_gpgme_signers_clear): New function without debug output.
	* g13.c (gpgme_op_vfs_mount): Add debug output.
	* assuan-support.c (my_spawn): Allow fd_child_list to be NULL.
	* conversion.c (_gpgme_encode_percent_string): Fix infinite loop.
	* debug.h: Put tag in front of debug lines, should make for nicer
	output.
	* engine-assuan.c (llass_new): Use our new system hooks for libassuan.
	* engine-g13.c (g13_new): Remove redundant assuan context allocation.
	* version.c (gpgme_check_version_internal): Delay debug output
	until after gpgme_check_version was called.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/g13.c b/src/g13.c
index 029a9141..a2ab675e 100644
--- a/src/g13.c
+++ b/src/g13.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 
 #include "gpgme.h"
+#include "debug.h"
 #include "context.h"
 #include "ops.h"
 #include "util.h"
@@ -135,9 +136,9 @@ gpgme_op_vfs_transact (gpgme_ctx_t ctx,
    or destroyed.  This is a synchronous convenience interface, which
    automatically returns an operation error if there is no
    transmission error.  */
-gpgme_error_t
-gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file,
-		    const char *mount_dir, int flags, gpgme_error_t *op_err)
+static gpgme_error_t
+_gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file,
+		     const char *mount_dir, int flags, gpgme_error_t *op_err)
 {
   gpg_error_t err;
   char *cmd;
@@ -194,3 +195,15 @@ gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file,
 
   return err;
 }
+
+gpgme_error_t
+gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file,
+		     const char *mount_dir, int flags, gpgme_error_t *op_err)
+{
+  TRACE_BEG4 (DEBUG_CTX, "gpgme_op_vfs_mount", ctx,
+	      "container=%s, mount_dir=%s, flags=0x%x, op_err=%p",
+	      container_file, mount_dir, flags, op_err);
+  return TRACE_ERR (_gpgme_op_vfs_mount (ctx, container_file, mount_dir,
+					 flags, op_err));
+}
+