From 36e2c1a9d1376057fb2b3c4ce016c2707ee49ca7 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 27 Oct 2009 19:23:56 +0000 Subject: 2009-10-27 Marcus Brinkmann * edit.c (gpgme_op_edit_start, gpgme_op_edit) (gpgme_op_card_edit_start, gpgme_op_card_edit): Add debug output. * encrypt-sign.c (gpgme_op_encrypt_sign_start) (gpgme_op_encrypt_sign): Likewise. * encrypt.c (gpgme_op_encrypt_start, gpgme_op_encrypt) (gpgme_op_encrypt_result): Likewise. * export.c (gpgme_op_export_start, gpgme_op_export) (gpgme_op_export_ext_start, gpgme_op_export_ext) (gpgme_op_export_keys_start, gpgme_op_export_keys): Likewise. * genkey.c (gpgme_op_genkey_start, gpgme_op_genkey) (gpgme_op_genkey_result): Likewise. * getauditlog.c (gpgme_op_getauditlog_start) (gpgme_op_getauditlog): Likewise. * import.c (gpgme_op_import_result, gpgme_op_import_start) (gpgme_op_import): Likewise. * keylist.c (gpgme_op_keylist_result, keylist_colon_handler) (gpgme_op_keylist_start, gpgme_op_keylist_ext_start) (gpgme_op_keylist_next, gpgme_op_keylist_end, gpgme_get_key): Likewise. * opassuan.c (gpgme_op_assuan_transact_start) (gpgme_op_assuan_transact_ext, gpgme_op_assuan_result) (gpgme_op_assuan_transact): Likewise. * signers.c (gpgme_signers_add, gpgme_signers_clear): Likewise. * trustlist.c (gpgme_op_trustlist_start) (gpgme_op_trustlist_next, gpgme_op_trustlist_end): Likewise. * verify.c (gpgme_op_verify_start, gpgme_op_verify) (gpgme_op_verify_result): Likewise. --- src/signers.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/signers.c') diff --git a/src/signers.c b/src/signers.c index f1ce58f1..da7d3196 100644 --- a/src/signers.c +++ b/src/signers.c @@ -28,8 +28,10 @@ #include #include +#include "gpgme.h" #include "util.h" #include "context.h" +#include "debug.h" /* Delete all signers from CTX. */ @@ -38,6 +40,8 @@ gpgme_signers_clear (gpgme_ctx_t ctx) { unsigned int i; + TRACE (DEBUG_CTX, "gpgme_signers_clear", ctx); + if (!ctx || !ctx->signers) return; @@ -54,8 +58,12 @@ gpgme_signers_clear (gpgme_ctx_t ctx) gpgme_error_t gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key) { + TRACE_BEG2 (DEBUG_CTX, "gpgme_signers_add", ctx, + "key=%p (%s)", key, (key->subkeys && !key->subkeys->fpr) ? + key->subkeys->fpr : "invalid"); + if (!ctx || !key) - return gpg_error (GPG_ERR_INV_VALUE); + return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE)); if (ctx->signers_len == ctx->signers_size) { @@ -65,7 +73,7 @@ gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key) newarr = realloc (ctx->signers, n * sizeof (*newarr)); if (!newarr) - return gpg_error_from_errno (errno); + return TRACE_ERR (gpg_error_from_errno (errno)); for (j = ctx->signers_size; j < n; j++) newarr[j] = NULL; ctx->signers = newarr; @@ -74,7 +82,7 @@ gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key) gpgme_key_ref (key); ctx->signers[ctx->signers_len++] = key; - return 0; + return TRACE_SUC (); } -- cgit v1.2.3