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.
This commit is contained in:
Marcus Brinkmann 2009-11-02 17:18:48 +00:00
parent 8c823dd784
commit 490661821a
6 changed files with 16 additions and 9 deletions

View File

@ -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>

View File

@ -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;

View File

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

View File

@ -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)
{

View File

@ -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;
}

View File

@ -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;
}