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/t-data.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 'tests/t-data.c')
| -rw-r--r-- | tests/t-data.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/t-data.c b/tests/t-data.c index 46c553db..882ffc82 100644 --- a/tests/t-data.c +++ b/tests/t-data.c @@ -157,7 +157,7 @@ write_test (round_t round, gpgme_data_t data) amt = gpgme_data_write (data, text, strlen (text)); if (amt != strlen (text)) - fail_if_err (GPGME_File_Error); + fail_if_err (gpg_error_from_errno (errno)); gpgme_data_seek (data, 0, SEEK_SET); @@ -191,7 +191,7 @@ main (int argc, char **argv) const char *text_filename = make_filename ("t-data-1.txt"); const char *longer_text_filename = make_filename ("t-data-2.txt"); const char *missing_filename = "this-file-surely-does-not-exist"; - gpgme_error_t err = GPGME_No_Error; + gpgme_error_t err = 0; gpgme_data_t data; while (++round) @@ -231,7 +231,8 @@ main (int argc, char **argv) case TEST_INOUT_MEM_FROM_FILE_NO_COPY: err = gpgme_data_new_from_file (&data, text_filename, 0); /* This is not implemented yet. */ - if (err == GPGME_Not_Implemented || err == GPGME_Invalid_Value) + if (gpg_err_code (err) == GPG_ERR_NOT_IMPLEMENTED + || gpg_err_code (err) == GPG_ERR_INV_VALUE) continue; break; case TEST_INOUT_MEM_FROM_FILE_PART_BY_NAME: |