From 65ecec1abe9ce864060f61f03d025fe98e7cbf55 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 5 Nov 2009 02:17:07 +0000 Subject: 2009-11-05 Marcus Brinkmann * decrypt.c (gpgme_op_decrypt_start): Fix use of debug macro. * decrypt-verify.c (gpgme_op_decrypt_verify_start): Likewise. * delete.c (gpgme_op_delete_start): Likewise. * edit.c (gpgme_op_edit_start, gpgme_op_card_edit_start): Likewise. * encrypt.c (gpgme_op_encrypt_start): Likewise. * encrypt-sign.c (gpgme_op_encrypt_sign_start): Likewise. * export.c (gpgme_op_export_start, gpgme_op_export_ext_start) (gpgme_op_export_keys_start, gpgme_op_export_keys): Likewise. * genkey.c (gpgme_op_genkey_start): Likewise. * getauditlog.c (gpgme_op_getauditlog_start): Likewise. * import.c (gpgme_op_import_start, gpgme_op_import_keys_start): Likewise. * opassuan.c (gpgme_op_assuan_transact_start): Likewise. * sign.c (gpgme_op_sign_start): Likewise. * verify.c (gpgme_op_verify_start): Likewise. * vfs-create.c (gpgme_op_vfs_create): Likewise. * vfs-mount.c (gpgme_op_vfs_mount): Likewise. --- src/export.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/export.c') diff --git a/src/export.c b/src/export.c index d57dc68e..16d9612f 100644 --- a/src/export.c +++ b/src/export.c @@ -75,9 +75,12 @@ gpgme_error_t gpgme_op_export_start (gpgme_ctx_t ctx, const char *pattern, gpgme_export_mode_t mode, gpgme_data_t keydata) { + gpgme_error_t err; + TRACE_BEG3 (DEBUG_CTX, "gpgme_op_export_start", ctx, "pattern=%s, mode=0x%x, keydata=%p", pattern, mode, keydata); - return TRACE_ERR (export_start (ctx, 0, pattern, mode, keydata)); + err = export_start (ctx, 0, pattern, mode, keydata); + return TRACE_ERR (err); } @@ -134,6 +137,8 @@ gpgme_error_t gpgme_op_export_ext_start (gpgme_ctx_t ctx, const char *pattern[], gpgme_export_mode_t mode, gpgme_data_t keydata) { + gpgme_error_t err; + TRACE_BEG2 (DEBUG_CTX, "gpgme_op_export_ext_start", ctx, "mode=0x%x, keydata=%p", mode, keydata); @@ -148,7 +153,8 @@ gpgme_op_export_ext_start (gpgme_ctx_t ctx, const char *pattern[], } } - return TRACE_ERR (export_ext_start (ctx, 0, pattern, mode, keydata)); + err = export_ext_start (ctx, 0, pattern, mode, keydata); + return TRACE_ERR (err); } @@ -244,6 +250,8 @@ gpgme_op_export_keys_start (gpgme_ctx_t ctx, gpgme_export_mode_t mode, gpgme_data_t keydata) { + gpg_error_t err; + TRACE_BEG2 (DEBUG_CTX, "gpgme_op_export_keys_start", ctx, "mode=0x%x, keydata=%p", mode, keydata); @@ -260,7 +268,8 @@ gpgme_op_export_keys_start (gpgme_ctx_t ctx, } } - return TRACE_ERR (export_keys_start (ctx, 0, keys, mode, keydata)); + err = export_keys_start (ctx, 0, keys, mode, keydata); + return TRACE_ERR (err); } gpgme_error_t @@ -290,6 +299,6 @@ gpgme_op_export_keys (gpgme_ctx_t ctx, err = export_keys_start (ctx, 1, keys, mode, keydata); if (!err) err = _gpgme_wait_one (ctx); - return err; + return TRACE_ERR (err); } -- cgit v1.2.3