diff options
| author | Marcus Brinkmann <[email protected]> | 2003-06-05 23:20:29 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-06-05 23:20:29 +0000 |
| commit | 02536bb72b884dceeaadda9364860f0649450e2e (patch) | |
| tree | afecdba3949d91312fa74bd6aa34fe898370415e /gpgme/passphrase.c | |
| parent | doc/ (diff) | |
| download | gpgme-02536bb72b884dceeaadda9364860f0649450e2e.tar.gz gpgme-02536bb72b884dceeaadda9364860f0649450e2e.zip | |
doc/
2003-06-06 Marcus Brinkmann <[email protected]>
* gpgme.texi: Change error codes to GPG_ERR_* variants.
(Error Handling): Rewritten.
gpgme/
2003-06-05 Marcus Brinkmann <[email protected]>
Everywhere: Use libgpg-error error codes.
* Makefile.am (EXTRA_DIST): Remove mkerrors.
(BUILT_SOURCES): Remove errors.c.
(MOSTLYCLEANFILES): Likewise.
(libgpgme_la_SOURCES): Likewise. Add error.c.
(errors.c): Remove target.
* mkerrors: File removed.
* error.c: New file.
* gpgme.h (gpgme_error_t): Change to type gpg_error_t.
(gpgme_err_code_t, gpgme_err_source_t): New types.
(gpgme_err_code, gpgme_err_source, gpgme_error, gpgme_err_make):
New static inline functions.
(gpgme_strsource, gpgme_err_code_from_errno,
gpgme_err_code_to_errno, gpgme_err_make_from_errno,
gpgme_error_from_errno): New prototypes.
tests/
2003-06-06 Marcus Brinkmann <[email protected]>
Everywhere: Use libgpg-error error codes.
* gpg/Makefile.am (noinst_HEADERS): New variable.
* gpg/t-support.h: New file.
* gpgsm/Makefile.am (noinst_HEADERS): New variable.
* gpgsm/t-support.h: New file.
Diffstat (limited to '')
| -rw-r--r-- | gpgme/passphrase.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c index e852e5cb..9fa6a130 100644 --- a/gpgme/passphrase.c +++ b/gpgme/passphrase.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <errno.h> #include "gpgme.h" #include "context.h" @@ -76,7 +77,7 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code, if (opd->uid_hint) free (opd->uid_hint); if (!(opd->uid_hint = strdup (args))) - return GPGME_Out_Of_Core; + return gpg_error_from_errno (errno); break; case GPGME_STATUS_BAD_PASSPHRASE: @@ -95,7 +96,7 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code, free (opd->passphrase_info); opd->passphrase_info = strdup (args); if (!opd->passphrase_info) - return GPGME_Out_Of_Core; + return gpg_error_from_errno (errno); break; case GPGME_STATUS_MISSING_PASSPHRASE: @@ -104,7 +105,7 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code, case GPGME_STATUS_EOF: if (opd->no_passphrase || opd->bad_passphrase) - return GPGME_Bad_Passphrase; + return gpg_error (GPG_ERR_BAD_PASSPHRASE); break; default: |