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/data-fd.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/data-fd.c') diff --git a/src/data-fd.c b/src/data-fd.c index 2c65be19..47a0d990 100644 --- a/src/data-fd.c +++ b/src/data-fd.c @@ -25,6 +25,7 @@ #include #include +#include "debug.h" #include "data.h" @@ -67,12 +68,15 @@ static struct _gpgme_data_cbs fd_cbs = gpgme_error_t -gpgme_data_new_from_fd (gpgme_data_t *dh, int fd) +gpgme_data_new_from_fd (gpgme_data_t *r_dh, int fd) { - gpgme_error_t err = _gpgme_data_new (dh, &fd_cbs); + gpgme_error_t err; + TRACE_BEG1 (DEBUG_DATA, "gpgme_data_new_from_fd", r_dh, "fd=0x%x", fd); + + err = _gpgme_data_new (r_dh, &fd_cbs); if (err) - return err; + return TRACE_ERR (err); - (*dh)->data.fd = fd; - return 0; + (*r_dh)->data.fd = fd; + return TRACE_SUC1 ("dh=%p", *r_dh); } -- cgit v1.2.3