From ae92f9282634a2ab61dfc2fb308030b61a37619d Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 26 Aug 2005 15:00:18 +0000 Subject: [PATCH] 2005-08-26 Marcus Brinkmann * edit.c (command_handler): Do not depend on PROCESSED being available. --- gpgme/ChangeLog | 3 +++ gpgme/edit.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 3c211d93..972f9e30 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,8 @@ 2005-08-26 Marcus Brinkmann + * edit.c (command_handler): Do not depend on PROCESSED being + available. + * engine.h (engine_command_handler_t): Add new argument processed. * ops.h (_gpgme_passphrase_command_handler_internal): Rename prototype to ... diff --git a/gpgme/edit.c b/gpgme/edit.c index 6ff8fba4..186d4f9d 100644 --- a/gpgme/edit.c +++ b/gpgme/edit.c @@ -63,20 +63,21 @@ edit_status_handler (void *priv, gpgme_status_code_t status, char *args) static gpgme_error_t command_handler (void *priv, gpgme_status_code_t status, const char *args, - int fd, int *processed) + int fd, int *processed_r) { gpgme_ctx_t ctx = (gpgme_ctx_t) priv; gpgme_error_t err; + int processed = 0; if (ctx->passphrase_cb) { err = _gpgme_passphrase_command_handler (ctx, status, args, - fd, processed); + fd, &processed); if (err) return err; } - if (!*processed) + if (!processed) { void *hook; op_data_t opd; @@ -89,11 +90,12 @@ command_handler (void *priv, gpgme_status_code_t status, const char *args, /* FIXME: We expect the user to handle _all_ status codes. Later, we may fix the callback interface to allow the user indicate if it processed the status code or not. */ - *processed = 1; + *processed_r = 1; return (*opd->fnc) (opd->fnc_value, status, args, fd); } + *processed_r = processed; return 0; }