diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-10-30 14:21:08 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-10-30 14:21:08 +0000 |
| commit | 9d3fdd8c96b79ecbd56cf6b1a424bb2e2cd5236d (patch) | |
| tree | c5e21b62188f0464553aec85047f468623dec3c7 /src/version.c | |
| parent | 6c3fadef5ed41556b4ef8798bebc7bed989e0c5c (diff) | |
| download | gpgme-9d3fdd8c96b79ecbd56cf6b1a424bb2e2cd5236d.tar.gz | |
2009-10-30 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for argp.h and error_t.
src/
2009-10-30 Marcus Brinkmann <marcus@g10code.de>
* 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.
Diffstat (limited to 'src/version.c')
| -rw-r--r-- | src/version.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c index b2d795ab..e5d7c3fc 100644 --- a/src/version.c +++ b/src/version.c @@ -193,7 +193,7 @@ gpgme_check_version (const char *req_version) do_subsystem_inits (); /* Catch-22: We need to get at least the debug subsystem ready - before using the tarce facility. If we won't the tarce would + 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, @@ -216,14 +216,15 @@ gpgme_check_version_internal (const char *req_version, { const char *result; - TRACE2 (DEBUG_INIT, "gpgme_check_version_internal: ", 0, - "req_version=%s, offset_sig_validity=%i", - req_version ? req_version : "(null)", offset_sig_validity); - result = gpgme_check_version (req_version); if (result == NULL) return result; + /* Catch-22, see above. */ + 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, |