From: Marcus Brinkmann <mb@g10code.com>
Date: Mon, 2 Nov 2009 17:18:48 +0000 (+0000)
Subject: 2009-11-02  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.3.0~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=490661821a0bba3b4e37015d8313a3dfb37c3a34;p=gpgme.git

2009-11-02  Marcus Brinkmann  <marcus@g10code.de>

	* debug.h (_gpgme_debug_buffer): Make TAG argument const const.
	* debug.c (_gpgme_debug_buffer): Likewise.
	* gpgme-tool.c (input_notify, output_notify): Adjust type to new
	assuan interface.
	* decrypt.c (gpgme_op_decrypt_result): Remove unused variable.
	* opassuan.c (gpgme_op_assuan_transact): Fix return value.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f50c5c..8c3689e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-02  Marcus Brinkmann  <marcus@g10code.de>
 
+	* debug.h (_gpgme_debug_buffer): Make TAG argument const const.
+	* debug.c (_gpgme_debug_buffer): Likewise.
+	* gpgme-tool.c (input_notify, output_notify): Adjust type to new
+	assuan interface.
+	* decrypt.c (gpgme_op_decrypt_result): Remove unused variable.
 	* opassuan.c (gpgme_op_assuan_transact): Fix return value.
 
 2009-10-30  Marcus Brinkmann  <marcus@g10code.de>
diff --git a/src/debug.c b/src/debug.c
index 979c625..c0e6155 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -266,7 +266,8 @@ _gpgme_debug_end (void **line)
 void
 _gpgme_debug_buffer (int lvl, const char *const fmt,
 		     const char *const func, const char *const tagname,
-		     void *tag, const char *const buffer, size_t len)
+		     const void *const tag, const char *const buffer,
+		     size_t len)
 {
   int idx = 0;
   int j;
diff --git a/src/debug.h b/src/debug.h
index ed93531..ccd48e1 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -73,7 +73,8 @@ void _gpgme_debug_end (void **helper);
 
 void _gpgme_debug_buffer (int lvl, const char *const fmt,
 			  const char *const func, const char *const tagname,
-			  void *tag, const char *const buffer, size_t len);
+			  const void *const tag, const char *const buffer,
+			  size_t len);
 
 
 /* Trace support.  */
diff --git a/src/decrypt.c b/src/decrypt.c
index 5e76156..da08e74 100644
--- a/src/decrypt.c
+++ b/src/decrypt.c
@@ -88,7 +88,6 @@ gpgme_op_decrypt_result (gpgme_ctx_t ctx)
   if (_gpgme_debug_trace ())
     {
       gpgme_recipient_t rcp;
-      int signatures = 0;
 
       if (opd->result.unsupported_algorithm)
 	{
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index 08cd82a..e4948e2 100644
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -1203,19 +1203,21 @@ cmd_keylist_mode (assuan_context_t ctx, char *line)
 }
 
 
-static void
-input_notify (assuan_context_t ctx, const char *line)
+static gpg_error_t
+input_notify (assuan_context_t ctx, char *line)
 {
   struct server *server = assuan_get_pointer (ctx);
   server->input_enc = server_data_encoding (line);
+  return 0;
 }
 
 
-static void
-output_notify (assuan_context_t ctx, const char *line)
+static gpg_error_t
+output_notify (assuan_context_t ctx, char *line)
 {
   struct server *server = assuan_get_pointer (ctx);
   server->output_enc = server_data_encoding (line);
+  return 0;
 }
 
 
diff --git a/src/opassuan.c b/src/opassuan.c
index c48c1a4..d015472 100644
--- a/src/opassuan.c
+++ b/src/opassuan.c
@@ -200,6 +200,5 @@ gpgme_op_assuan_transact (gpgme_ctx_t ctx,
   err = gpgme_op_assuan_transact_ext (ctx, command, data_cb, data_cb_value,
 				      inq_cb, inq_cb_value,
 				      status_cb, status_cb_value, NULL);
-
-  return TRACE_ERR (err);
+  return err;
 }