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, 20 insertions, 2 deletions

diff --git a/src/genkey.c b/src/genkey.c
index afebb7cb..32c6f36a 100644
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 
 #include "gpgme.h"
+#include "debug.h"
 #include "context.h"
 #include "ops.h"
 
@@ -59,11 +60,21 @@ gpgme_op_genkey_result (gpgme_ctx_t ctx)
   op_data_t opd;
   gpgme_error_t err;
 
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_genkey_result", ctx);
+
   err = _gpgme_op_data_lookup (ctx, OPDATA_GENKEY, &hook, -1, NULL);
   opd = hook;
   if (err || !opd)
-    return NULL;
+    {
+      TRACE_SUC0 ("result=(null)");
+      return NULL;
+    }
 
+  TRACE_LOG3 ("fpr = %s, %s, %s", opd->result.fpr,
+	      opd->result.primary ? "primary" : "no primary",
+	      opd->result.sub ? "sub" : "no sub");
+
+  TRACE_SUC1 ("result=%p", &opd->result);
   return &opd->result;
 }
 
@@ -186,7 +197,10 @@ gpgme_error_t
 gpgme_op_genkey_start (gpgme_ctx_t ctx, const char *parms,
 		       gpgme_data_t pubkey, gpgme_data_t seckey)
 {
-  return genkey_start (ctx, 0, parms, pubkey, seckey);
+  TRACE_BEG2 (DEBUG_CTX, "gpgme_op_genkey_start", ctx,
+	      "pubkey=%p, seckey=%p", pubkey, seckey);
+  TRACE_LOGBUF (parms, strlen (parms));
+  return TRACE_ERR (genkey_start (ctx, 0, parms, pubkey, seckey));
 }
 
 
@@ -199,6 +213,10 @@ gpgme_op_genkey (gpgme_ctx_t ctx, const char *parms, gpgme_data_t pubkey,
 {
   gpgme_error_t err;
 
+  TRACE_BEG2 (DEBUG_CTX, "gpgme_op_genkey", ctx,
+	      "pubkey=%p, seckey=%p", pubkey, seckey);
+  TRACE_LOGBUF (parms, strlen (parms));
+
   err = genkey_start (ctx, 1, parms, pubkey, seckey);
   if (!err)
     err = _gpgme_wait_one (ctx);