diff options
| author | Marcus Brinkmann <[email protected]> | 2003-01-29 16:10:35 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-01-29 16:10:35 +0000 |
| commit | 6912c46a77d2aa1274aeef028d8e98bd917b64dc (patch) | |
| tree | 8e537b11f0a4188d2da3861639695ea083ad6328 /gpgme/passphrase.c | |
| parent | Add some items, remove obsolete item about pipemode. (diff) | |
| download | gpgme-6912c46a77d2aa1274aeef028d8e98bd917b64dc.tar.gz gpgme-6912c46a77d2aa1274aeef028d8e98bd917b64dc.zip | |
2003-01-29 Marcus Brinkmann <[email protected]>
* util.h (mk_error): Remove macro.
* conversion.c, data.c, data-compat.c, decrypt.c, delete.c,
edit.c, encrypt.c, encrypt-sign.c, engine.c, engine-gpgsm.c,
export.c, genkey.c, gpgme.c, import.c, key.c, keylist.c,
passphrase.c, progress.c, recipient.c, rungpg.c, sign.c,
signers.c, trustlist.c, verify.c, wait.c, wait-global.c,
wait-private (literally everywhere): Expand the mk_error macro.
Diffstat (limited to '')
| -rw-r--r-- | gpgme/passphrase.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c index 9bcbd17b..f9020fdb 100644 --- a/gpgme/passphrase.c +++ b/gpgme/passphrase.c @@ -62,7 +62,7 @@ _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args case GPGME_STATUS_USERID_HINT: free (ctx->result.passphrase->userid_hint); if (!(ctx->result.passphrase->userid_hint = strdup (args))) - return mk_error (Out_Of_Core); + return GPGME_Out_Of_Core; break; case GPGME_STATUS_BAD_PASSPHRASE: @@ -80,7 +80,7 @@ _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args free (ctx->result.passphrase->passphrase_info); ctx->result.passphrase->passphrase_info = strdup (args); if (!ctx->result.passphrase->passphrase_info) - return mk_error (Out_Of_Core); + return GPGME_Out_Of_Core; break; case GPGME_STATUS_MISSING_PASSPHRASE: @@ -91,7 +91,7 @@ _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args case GPGME_STATUS_EOF: if (ctx->result.passphrase->no_passphrase || ctx->result.passphrase->bad_passphrase) - return mk_error (No_Passphrase); + return GPGME_No_Passphrase; break; default: @@ -112,7 +112,7 @@ _gpgme_passphrase_command_handler (void *opaque, GpgmeStatusCode code, { ctx->result.passphrase = calloc (1, sizeof *ctx->result.passphrase); if (!ctx->result.passphrase) - return mk_error (Out_Of_Core); + return GPGME_Out_Of_Core; } if (!code) @@ -149,7 +149,7 @@ _gpgme_passphrase_command_handler (void *opaque, GpgmeStatusCode code, buf = malloc (20 + strlen (userid_hint) + strlen (passphrase_info) + 3); if (!buf) - return mk_error (Out_Of_Core); + return GPGME_Out_Of_Core; sprintf (buf, "%s\n%s\n%s", bad_passphrase ? "TRY_AGAIN":"ENTER", userid_hint, passphrase_info); |