2009-10-27 Marcus Brinkmann <[email protected]>

	* 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.

1 files changed, 29 insertions, 6 deletions

diff --git a/src/edit.c b/src/edit.c
index 186d4f9d..edf20894 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 
 #include "gpgme.h"
+#include "debug.h"
 #include "context.h"
 #include "ops.h"
 
@@ -138,7 +139,11 @@ gpgme_error_t
 gpgme_op_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 		     gpgme_edit_cb_t fnc, void *fnc_value, gpgme_data_t out)
 {
-  return edit_start (ctx, 0, 0, key, fnc, fnc_value, out);
+  TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit_start", ctx,
+	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
+	      (key->subkeys && !key->subkeys->fpr) ? 
+	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
+  return TRACE_ERR (edit_start (ctx, 0, 0, key, fnc, fnc_value, out));
 }
 
 
@@ -148,10 +153,18 @@ gpgme_error_t
 gpgme_op_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 	       gpgme_edit_cb_t fnc, void *fnc_value, gpgme_data_t out)
 {
-  gpgme_error_t err = edit_start (ctx, 1, 0, key, fnc, fnc_value, out);
+  gpgme_error_t err;
+
+  TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit", ctx,
+	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
+	      (key->subkeys && !key->subkeys->fpr) ? 
+	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
+
+  err = edit_start (ctx, 1, 0, key, fnc, fnc_value, out);
+
   if (!err)
     err = _gpgme_wait_one (ctx);
-  return err;
+  return TRACE_ERR (err);
 }
 
 
@@ -160,7 +173,11 @@ gpgme_op_card_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 			  gpgme_edit_cb_t fnc, void *fnc_value,
 			  gpgme_data_t out)
 {
-  return edit_start (ctx, 0, 1, key, fnc, fnc_value, out);
+  TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit_start", ctx,
+	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
+	      (key->subkeys && !key->subkeys->fpr) ? 
+	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
+  return TRACE_ERR (edit_start (ctx, 0, 1, key, fnc, fnc_value, out));
 }
 
 
@@ -170,8 +187,14 @@ gpgme_error_t
 gpgme_op_card_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 		    gpgme_edit_cb_t fnc, void *fnc_value, gpgme_data_t out)
 {
-  gpgme_error_t err = edit_start (ctx, 1, 1, key, fnc, fnc_value, out);
+  gpgme_error_t err;
+
+  TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit", ctx,
+	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
+	      (key->subkeys && !key->subkeys->fpr) ? 
+	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
+  err = edit_start (ctx, 1, 1, key, fnc, fnc_value, out);
   if (!err)
     err = _gpgme_wait_one (ctx);
-  return err;
+  return TRACE_ERR (err);
 }