From ca67902311b832f8dfe1cabb5bf358890a1d3821 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 26 Oct 2009 17:38:39 +0000 Subject: 2009-10-26 Marcus Brinkmann * debug.h (DEBUG_GLOBAL): New debug level. * conversion.c (gnupg_errors, _gpgme_map_gnupg_error): Removed. * data-user.c (gpgme_data_new_from_cbs): Add debug output. * data-fd.c (gpgme_data_new_from_fd): Likewise. * data-stream.c (gpgme_data_new_from_stream): Likewise. * decrypt.c (gpgme_op_decrypt_result, gpgme_op_decrypt_start) (gpgme_op_decrypt): Likewise. * delete.c (gpgme_op_delete_start, gpgme_op_delete): Likewise. * decrypt-verify.c (gpgme_op_decrypt_verify_start) (gpgme_op_decrypt_verify): Likewise. * sign.c (gpgme_op_sign_result): Fix debug message. * data-mem.c (gpgme_data_new): Improve debug output. * verify.c (parse_trust): Use atoi instead of _gpgme_map_gnupg_error. * decrypt.c (_gpgme_decrypt_status_handler): Likewise. --- src/delete.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/delete.c') diff --git a/src/delete.c b/src/delete.c index 38f2fddb..1fd5bd8e 100644 --- a/src/delete.c +++ b/src/delete.c @@ -24,6 +24,7 @@ #include #include +#include "debug.h" #include "gpgme.h" #include "context.h" #include "ops.h" @@ -93,7 +94,11 @@ gpgme_error_t gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key, int allow_secret) { - return delete_start (ctx, 0, key, allow_secret); + TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx, + "key=%p (%s), allow_secret=%i", key, + (key->subkeys && !key->subkeys->fpr) ? + key->subkeys->fpr : "invalid", allow_secret); + return TRACE_ERR (delete_start (ctx, 0, key, allow_secret)); } @@ -102,7 +107,13 @@ gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key, gpgme_error_t gpgme_op_delete (gpgme_ctx_t ctx, const gpgme_key_t key, int allow_secret) { - gpgme_error_t err = delete_start (ctx, 1, key, allow_secret); + gpgme_error_t err; + + TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx, + "key=%p (%s), allow_secret=%i", key, + (key->subkeys && !key->subkeys->fpr) ? + key->subkeys->fpr : "invalid", allow_secret); + err = delete_start (ctx, 1, key, allow_secret); if (!err) err = _gpgme_wait_one (ctx); return err; -- cgit v1.2.3