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, 90 insertions, 90 deletions

diff --git a/src/debug.h b/src/debug.h
index c4455b2e..ed93531f 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -89,155 +89,155 @@ void _gpgme_debug_buffer (int lvl, const char *const fmt,
 
 #define TRACE_BEG(lvl, name, tag)			   \
   _TRACE (lvl, name, tag);				   \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,   \
-		_gpgme_trace_tag), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,   \
+		_gpgme_trace_func), 0
 #define TRACE_BEG0(lvl, name, tag, fmt)					\
   _TRACE (lvl, name, tag);						\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func), 0
 #define TRACE_BEG1(lvl, name, tag, fmt, arg1)				\
   _TRACE (lvl, name, tag);						\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag, arg1), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func, arg1), 0
 #define TRACE_BEG2(lvl, name, tag, fmt, arg1, arg2)		    \
   _TRACE (lvl, name, tag);					    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2), 0
 #define TRACE_BEG3(lvl, name, tag, fmt, arg1, arg2, arg3)	    \
   _TRACE (lvl, name, tag);					    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3), 0
 #define TRACE_BEG4(lvl, name, tag, fmt, arg1, arg2, arg3, arg4)	    \
   _TRACE (lvl, name, tag);					    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4), 0
 #define TRACE_BEG5(lvl, name, tag, fmt, arg1, arg2, arg3, arg4, arg5) \
   _TRACE (lvl, name, tag);					    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4, arg5), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4, arg5), 0
 #define TRACE_BEG7(lvl, name, tag, fmt, arg1, arg2, arg3, arg4,	    \
 		   arg5, arg6, arg7)				    \
   _TRACE (lvl, name, tag);					    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4, arg5,	    \
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4, arg5,	    \
 		arg6, arg7), 0
 #define TRACE_BEG8(lvl, name, tag, fmt, arg1, arg2, arg3, arg4,	    \
 		   arg5, arg6, arg7, arg8)			    \
   _TRACE (lvl, name, tag);					    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): enter: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4, arg5,	    \
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: enter: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4, arg5,	    \
 		arg6, arg7, arg8), 0
 
 #define TRACE(lvl, name, tag)						\
-  _gpgme_debug (lvl, "%s (%s=%p): call\n",				\
-		name, STRINGIFY (tag), (void *) (uintptr_t) tag), 0
+  _gpgme_debug (lvl, "[%s=%p] %s: call\n",				\
+		STRINGIFY (tag), (void *) (uintptr_t) tag, name), 0
 #define TRACE0(lvl, name, tag, fmt)					\
-  _gpgme_debug (lvl, "%s (%s=%p): call: " fmt "\n",			\
-		name, STRINGIFY (tag), (void *) (uintptr_t) tag), 0
+  _gpgme_debug (lvl, "[%s=%p] %s: call: " fmt "\n",			\
+		STRINGIFY (tag), (void *) (uintptr_t) tag, name), 0
 #define TRACE1(lvl, name, tag, fmt, arg1)			       \
-  _gpgme_debug (lvl, "%s (%s=%p): call: " fmt "\n",		       \
-		name, STRINGIFY (tag), (void *) (uintptr_t) tag, arg1), 0
+  _gpgme_debug (lvl, "[%s=%p] %s: call: " fmt "\n",		       \
+		STRINGIFY (tag), (void *) (uintptr_t) tag, name, arg1), 0
 #define TRACE2(lvl, name, tag, fmt, arg1, arg2)			       \
-  _gpgme_debug (lvl, "%s (%s=%p): call: " fmt "\n",		       \
-		name, STRINGIFY (tag), (void *) (uintptr_t) tag, arg1, \
+  _gpgme_debug (lvl, "[%s=%p] %s: call: " fmt "\n",		       \
+		STRINGIFY (tag), (void *) (uintptr_t) tag, name, arg1, \
 		arg2), 0
 #define TRACE3(lvl, name, tag, fmt, arg1, arg2, arg3)		       \
-  _gpgme_debug (lvl, "%s (%s=%p): call: " fmt "\n",		       \
-		name, STRINGIFY (tag), (void *) (uintptr_t) tag, arg1, \
+  _gpgme_debug (lvl, "[%s=%p] %s: call: " fmt "\n",		       \
+		STRINGIFY (tag), (void *) (uintptr_t) tag, name, arg1, \
 		arg2, arg3), 0
 #define TRACE6(lvl, name, tag, fmt, arg1, arg2, arg3, arg4, arg5, arg6)	\
-  _gpgme_debug (lvl, "%s (%s=%p): call: " fmt "\n",			\
-		name, STRINGIFY (tag), (void *) (uintptr_t) tag, arg1,  \
+  _gpgme_debug (lvl, "[%s=%p] %s: call: " fmt "\n",			\
+		STRINGIFY (tag), (void *) (uintptr_t) tag, name, arg1,  \
 		arg2, arg3, arg4, arg5, arg6), 0
 
 #define TRACE_ERR(err)							\
   err == 0 ? (TRACE_SUC ()) :						\
-    (_gpgme_debug (_gpgme_trace_level, "%s (%s=%p): error: %s <%s>\n",	\
-		   _gpgme_trace_func, _gpgme_trace_tagname,		\
-		   _gpgme_trace_tag, gpgme_strerror (err),		\
+    (_gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: error: %s <%s>\n",	\
+		   _gpgme_trace_tagname, _gpgme_trace_tag,		\
+		   _gpgme_trace_func, gpgme_strerror (err),		\
 		   gpgme_strsource (err)), (err))
 /* The cast to void suppresses GCC warnings.  */
 #define TRACE_SYSRES(res)						\
   res >= 0 ? ((void) (TRACE_SUC1 ("result=%i", res)), (res)) :		\
-    (_gpgme_debug (_gpgme_trace_level, "%s (%s=%p): error: %s\n",	\
-		   _gpgme_trace_func, _gpgme_trace_tagname,		\
-		   _gpgme_trace_tag, strerror (errno)), (res))
+    (_gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: error: %s\n",	\
+		   _gpgme_trace_tagname, _gpgme_trace_tag,		\
+		   _gpgme_trace_func, strerror (errno)), (res))
 #define TRACE_SYSERR(res)						\
   res == 0 ? ((void) (TRACE_SUC1 ("result=%i", res)), (res)) :		\
-    (_gpgme_debug (_gpgme_trace_level, "%s (%s=%p): error: %s\n",	\
-		   _gpgme_trace_func, _gpgme_trace_tagname,		\
-		   _gpgme_trace_tag, strerror (res)), (res))
+    (_gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: error: %s\n",	\
+		   _gpgme_trace_tagname, _gpgme_trace_tag,		\
+		   _gpgme_trace_func, strerror (res)), (res))
 
 #define TRACE_SUC()						 \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): leave\n",       \
-		_gpgme_trace_func, _gpgme_trace_tagname,	 \
-		_gpgme_trace_tag), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: leave\n",       \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	 \
+		_gpgme_trace_func), 0
 #define TRACE_SUC0(fmt)							\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): leave: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: leave: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func), 0
 #define TRACE_SUC1(fmt, arg1)						\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): leave: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag, arg1), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: leave: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func, arg1), 0
 #define TRACE_SUC2(fmt, arg1, arg2)					\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): leave: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag, arg1, arg2), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: leave: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func, arg1, arg2), 0
 #define TRACE_SUC5(fmt, arg1, arg2, arg3, arg4, arg5)			\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): leave: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4, arg5), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: leave: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func, arg1, arg2, arg3, arg4, arg5), 0
 
 #define TRACE_LOG(fmt)							\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func), 0
 #define TRACE_LOG1(fmt, arg1)						\
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n",	\
-		_gpgme_trace_func, _gpgme_trace_tagname,		\
-		_gpgme_trace_tag, arg1), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n",	\
+		_gpgme_trace_tagname, _gpgme_trace_tag,		\
+		_gpgme_trace_func, arg1), 0
 #define TRACE_LOG2(fmt, arg1, arg2)				    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2), 0
 #define TRACE_LOG3(fmt, arg1, arg2, arg3)			    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3), 0
 #define TRACE_LOG4(fmt, arg1, arg2, arg3, arg4)			    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4), 0
 #define TRACE_LOG5(fmt, arg1, arg2, arg3, arg4, arg5)		    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4, arg5), 0
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4, arg5), 0
 #define TRACE_LOG6(fmt, arg1, arg2, arg3, arg4, arg5, arg6)	    \
-  _gpgme_debug (_gpgme_trace_level, "%s (%s=%p): check: " fmt "\n", \
-		_gpgme_trace_func, _gpgme_trace_tagname,	    \
-		_gpgme_trace_tag, arg1, arg2, arg3, arg4, arg5,	    \
+  _gpgme_debug (_gpgme_trace_level, "[%s=%p] %s: check: " fmt "\n", \
+		_gpgme_trace_tagname, _gpgme_trace_tag,	    \
+		_gpgme_trace_func, arg1, arg2, arg3, arg4, arg5,	    \
 		arg6), 0
 
 #define TRACE_LOGBUF(buf, len)						\
-  _gpgme_debug_buffer (_gpgme_trace_level, "%s (%s=%p): check: %s",	\
-		       _gpgme_trace_func, _gpgme_trace_tagname,		\
-		       _gpgme_trace_tag, buf, len)
+  _gpgme_debug_buffer (_gpgme_trace_level, "[%s=%p] %s: check: %s",	\
+		       _gpgme_trace_tagname, _gpgme_trace_tag,		\
+		       _gpgme_trace_func, buf, len)
 
 #define TRACE_SEQ(hlp,fmt)						\
   _gpgme_debug_begin (&(hlp), _gpgme_trace_level,			\
-		      "%s (%s=%p): check: " fmt,			\
-		      _gpgme_trace_func, _gpgme_trace_tagname,		\
-		      _gpgme_trace_tag)
+		      "[%s=%p] %s: check: " fmt,			\
+		      _gpgme_trace_tagname, _gpgme_trace_tag,		\
+		      _gpgme_trace_func)
 #define TRACE_ADD0(hlp,fmt) \
   _gpgme_debug_add (&(hlp), fmt)
 #define TRACE_ADD1(hlp,fmt,a) \