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

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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/decrypt-verify.c b/src/decrypt-verify.c
index 2fa3bb24..77b725f4 100644
--- a/src/decrypt-verify.c
+++ b/src/decrypt-verify.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include "debug.h"
 #include "gpgme.h"
 #include "ops.h"
 
@@ -86,7 +87,9 @@ gpgme_error_t
 gpgme_op_decrypt_verify_start (gpgme_ctx_t ctx, gpgme_data_t cipher,
 			       gpgme_data_t plain)
 {
-  return decrypt_verify_start (ctx, 0, cipher, plain);
+  TRACE_BEG2 (DEBUG_CTX, "gpgme_op_decrypt_verify_start", ctx,
+	      "cipher=%p, plain=%p", cipher, plain);
+  return TRACE_ERR (decrypt_verify_start (ctx, 0, cipher, plain));
 }
 
 
@@ -96,8 +99,12 @@ gpgme_error_t
 gpgme_op_decrypt_verify (gpgme_ctx_t ctx, gpgme_data_t cipher,
 			 gpgme_data_t plain)
 {
-  gpgme_error_t err = decrypt_verify_start (ctx, 1, cipher, plain);
+  gpgme_error_t err;
+
+  TRACE_BEG2 (DEBUG_CTX, "gpgme_op_decrypt_verify", ctx,
+	      "cipher=%p, plain=%p", cipher, plain);
+  err = decrypt_verify_start (ctx, 1, cipher, plain);
   if (!err)
     err = _gpgme_wait_one (ctx);
-  return err;
+  return TRACE_ERR (err);
 }