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 /tests/gpgsm/t-verify.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-- | tests/gpgsm/t-verify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c index de36073b..be61cbb2 100644 --- a/tests/gpgsm/t-verify.c +++ b/tests/gpgsm/t-verify.c @@ -78,7 +78,7 @@ check_result (gpgme_verify_result_t result, int summary, char *fpr, __FILE__, __LINE__, sig->fpr); exit (1); } - if (sig->status != status) + if (gpg_err_code (sig->status) != status) { fprintf (stderr, "%s:%i: Unexpected signature status: %s\n", __FILE__, __LINE__, gpgme_strerror (sig->status)); @@ -102,7 +102,7 @@ check_result (gpgme_verify_result_t result, int summary, char *fpr, __FILE__, __LINE__, sig->validity); exit (1); } - if (sig->validity_reason != GPGME_No_Error) + if (gpg_err_code (sig->validity_reason) != GPG_ERR_NO_ERROR) { fprintf (stderr, "%s:%i: Unexpected validity reason: %s\n", __FILE__, __LINE__, gpgme_strerror (sig->validity_reason)); @@ -133,7 +133,7 @@ main (int argc, char **argv) result = gpgme_op_verify_result (ctx); check_result (result, GPGME_SIGSUM_VALID | GPGME_SIGSUM_GREEN, "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E", - GPGME_No_Error, GPGME_VALIDITY_FULL); + GPG_ERR_NO_ERROR, GPGME_VALIDITY_FULL); /* Checking a manipulated message. */ gpgme_data_release (text); @@ -145,7 +145,7 @@ main (int argc, char **argv) result = gpgme_op_verify_result (ctx); check_result (result, GPGME_SIGSUM_RED, "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E", - GPGME_Bad_Signature, GPGME_VALIDITY_UNKNOWN); + GPG_ERR_BAD_SIGNATURE, GPGME_VALIDITY_UNKNOWN); gpgme_release (ctx); return 0; |