From 49693e8e45ec9233f779e8f1d8a30f54b683c6ff Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 4 Nov 2009 18:13:44 +0000 Subject: 2009-11-04 Marcus Brinkmann * ath.h (ath_self): New prototype. Include * ath.c, ath-pth.c, ath-pthread.c (ath_self): New function. * debug.h: Rewrite most macros to beautify debug output. (_gpgme_debug_buffer): Remove tagname and tag argument. (_gpgme_debug_frame_begin, _gpgme_debug_frame_end): New prototypes. * debug.c: Include . Don't include assuan.h. (frame_nr, FRAME_NR): New thread-specific variable and macro. (debug_init): Do not initialize assuan. Call _gpgme_debug after initialization instead using printf directly. (_gpgme_debug): Do not call debug_init (we now ensure proper initialization by user). Add timestamp and thread/process ID. (_gpgme_debug_buffer): Do not take tagname and tag argument. (_gpgme_debug_frame_begin, _gpgme_debug_frame_end): New functions. * version.c (gpgme_check_version_internal, gpgme_check_version): Fix debug string. Do not initialize assuan. * posix-io.c (get_max_fds): Use 0 not NULL (nicer debug output). --- src/version.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/version.c') diff --git a/src/version.c b/src/version.c index e5d7c3fc..415279cf 100644 --- a/src/version.c +++ b/src/version.c @@ -73,9 +73,6 @@ do_subsystem_inits (void) #endif _gpgme_sema_subsystem_init (); -#ifdef HAVE_ASSUAN_H - assuan_set_assuan_err_source (GPG_ERR_SOURCE_GPGME); -#endif /*HAVE_ASSUAN_H*/ _gpgme_debug_subsystem_init (); _gpgme_io_subsystem_init (); #if defined(HAVE_W32_SYSTEM) && defined(HAVE_ASSUAN_H) @@ -196,7 +193,7 @@ gpgme_check_version (const char *req_version) before using the trace facility. If we won't the trace would automagically initialize the debug system with out the locks being initialized and missing the assuan log level setting. */ - TRACE2 (DEBUG_INIT, "gpgme_check_version: ", 0, + TRACE2 (DEBUG_INIT, "gpgme_check_version", 0, "req_version=%s, VERSION=%s", req_version? req_version:"(null)", VERSION); @@ -221,13 +218,13 @@ gpgme_check_version_internal (const char *req_version, return result; /* Catch-22, see above. */ - TRACE2 (DEBUG_INIT, "gpgme_check_version_internal: ", 0, + TRACE2 (DEBUG_INIT, "gpgme_check_version_internal", 0, "req_version=%s, offset_sig_validity=%i", req_version ? req_version : "(null)", offset_sig_validity); if (offset_sig_validity != offsetof (struct _gpgme_signature, validity)) { - TRACE1 (DEBUG_INIT, "gpgme_check_version_internal: ", 0, + TRACE1 (DEBUG_INIT, "gpgme_check_version_internal", 0, "offset_sig_validity mismatch: expected %i", offsetof (struct _gpgme_signature, validity)); _gpgme_selftest = GPG_ERR_SELFTEST_FAILED; -- cgit v1.2.3