diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ops.h | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/gpgme/ops.h b/gpgme/ops.h index 022eef52..602b4ea1 100644 --- a/gpgme/ops.h +++ b/gpgme/ops.h @@ -25,23 +25,20 @@ /* Support macros. */ -#define test_and_allocate_result(ctx,field) \ - do \ - { \ - if (!ctx->result.field) \ - { \ - ctx->result.field = calloc (1, sizeof *ctx->result.field); \ - if (!ctx->result.field) \ - { \ - ctx->error = mk_error (Out_Of_Core); \ - return; \ - } \ - } \ - } \ +#define test_and_allocate_result(ctx,field) \ + do \ + { \ + if (!ctx->result.field) \ + { \ + ctx->result.field = calloc (1, sizeof *ctx->result.field); \ + if (!ctx->result.field) \ + return mk_error (Out_Of_Core); \ + } \ + } \ while (0) /*-- gpgme.c --*/ -void _gpgme_release_result ( GpgmeCtx c ); +void _gpgme_release_result (GpgmeCtx ctx); void _gpgme_set_op_info (GpgmeCtx c, GpgmeData info); void _gpgme_op_event_cb (void *data, GpgmeEventIO type, void *type_data); @@ -72,8 +69,8 @@ GpgmeError _gpgme_data_append_percentstring_for_xml ( GpgmeData dh, GpgmeError _gpgme_data_unread (GpgmeData dh, const char *buffer, size_t length ); -void _gpgme_data_inbound_handler (void *opaque, int fd); -void _gpgme_data_outbound_handler (void *opaque, int fd); +GpgmeError _gpgme_data_inbound_handler (void *opaque, int fd); +GpgmeError _gpgme_data_outbound_handler (void *opaque, int fd); /*-- key.c --*/ GpgmeError _gpgme_key_new ( GpgmeKey *r_key ); @@ -84,13 +81,13 @@ GpgmeError _gpgme_op_reset (GpgmeCtx ctx, int synchronous); /*-- verify.c --*/ void _gpgme_release_verify_result (VerifyResult result); -void _gpgme_verify_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, - char *args); +GpgmeError _gpgme_verify_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, + char *args); /*-- decrypt.c --*/ void _gpgme_release_decrypt_result (DecryptResult result); -void _gpgme_decrypt_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, - char *args); +GpgmeError _gpgme_decrypt_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, + char *args); GpgmeError _gpgme_decrypt_start (GpgmeCtx ctx, int synchronous, GpgmeData ciph, GpgmeData plain, void *status_handler); @@ -98,26 +95,26 @@ GpgmeError _gpgme_decrypt_result (GpgmeCtx ctx); /*-- sign.c --*/ void _gpgme_release_sign_result ( SignResult res ); -void _gpgme_sign_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, - char *args); +GpgmeError _gpgme_sign_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, + char *args); /*-- encrypt.c --*/ void _gpgme_release_encrypt_result ( EncryptResult res ); -void _gpgme_encrypt_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, - char *args); +GpgmeError _gpgme_encrypt_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, + char *args); /*-- passphrase.c --*/ void _gpgme_release_passphrase_result (PassphraseResult result); -void _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, - char *args); -const char * _gpgme_passphrase_command_handler (void *opaque, - GpgmeStatusCode code, - const char *key); +GpgmeError _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, + char *args); +GpgmeError _gpgme_passphrase_command_handler (void *opaque, + GpgmeStatusCode code, + const char *key, const char **result); GpgmeError _gpgme_passphrase_start (GpgmeCtx ctx); /*-- progress.c --*/ -void _gpgme_progress_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, - char *args); +GpgmeError _gpgme_progress_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, + char *args); /*-- import.c --*/ void _gpgme_release_import_result (ImportResult res); |