diff options
Diffstat (limited to 'tests/gpg')
| -rw-r--r-- | tests/gpg/t-decrypt-verify.c | 4 | ||||
| -rw-r--r-- | tests/gpg/t-edit.c | 4 | ||||
| -rw-r--r-- | tests/gpg/t-eventloop.c | 2 | ||||
| -rw-r--r-- | tests/gpg/t-keylist-sig.c | 6 | ||||
| -rw-r--r-- | tests/gpg/t-keylist.c | 2 | ||||
| -rw-r--r-- | tests/gpg/t-support.h | 2 | ||||
| -rw-r--r-- | tests/gpg/t-trustlist.c | 2 | ||||
| -rw-r--r-- | tests/gpg/t-verify.c | 8 | ||||
| -rw-r--r-- | tests/gpg/t-wait.c | 2 |
9 files changed, 14 insertions, 18 deletions
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c index 697d3834..113aec13 100644 --- a/tests/gpg/t-decrypt-verify.c +++ b/tests/gpg/t-decrypt-verify.c @@ -61,7 +61,7 @@ check_verify_result (gpgme_verify_result_t result, unsigned int summary, __FILE__, __LINE__, sig->fpr); exit (1); } - if (gpg_err_code (sig->status) != status) + if (gpgme_err_code (sig->status) != status) { fprintf (stderr, "%s:%i: Unexpected signature status: %s\n", __FILE__, __LINE__, gpgme_strerror (sig->status)); @@ -85,7 +85,7 @@ check_verify_result (gpgme_verify_result_t result, unsigned int summary, __FILE__, __LINE__, sig->validity); exit (1); } - if (gpg_err_code (sig->validity_reason) != GPG_ERR_NO_ERROR) + if (gpgme_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)); diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c index 394379dd..545db738 100644 --- a/tests/gpg/t-edit.c +++ b/tests/gpg/t-edit.c @@ -46,11 +46,11 @@ flush_data (gpgme_data_t dh) ret = gpgme_data_seek (dh, 0, SEEK_SET); if (ret) - fail_if_err (gpg_error_from_errno (errno)); + fail_if_err (gpgme_error_from_errno (errno)); while ((ret = gpgme_data_read (dh, buf, 100)) > 0) fwrite (buf, ret, 1, stdout); if (ret < 0) - fail_if_err (gpg_error_from_errno (errno)); + fail_if_err (gpgme_error_from_errno (errno)); } diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c index bf1ab4ef..cb1e57c6 100644 --- a/tests/gpg/t-eventloop.c +++ b/tests/gpg/t-eventloop.c @@ -78,7 +78,7 @@ add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data, } } if (i == FDLIST_MAX) - return gpg_err_make (GPG_ERR_SOURCE_USER_1, GPG_ERR_GENERAL); + return gpgme_err_make (GPG_ERR_SOURCE_USER_1, GPG_ERR_GENERAL); *r_tag = &fds[i]; return 0; } diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c index b89ba33d..9482c74e 100644 --- a/tests/gpg/t-keylist-sig.c +++ b/tests/gpg/t-keylist-sig.c @@ -605,14 +605,10 @@ main (int argc, char **argv) exit (1); } - - - - gpgme_key_unref (key); i++; } - if (gpg_err_code (err) != GPG_ERR_EOF) + if (gpgme_err_code (err) != GPG_ERR_EOF) fail_if_err (err); err = gpgme_op_keylist_end (ctx); fail_if_err (err); diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c index 2c049359..67844cb0 100644 --- a/tests/gpg/t-keylist.c +++ b/tests/gpg/t-keylist.c @@ -551,7 +551,7 @@ main (int argc, char **argv) gpgme_key_unref (key); i++; } - if (gpg_err_code (err) != GPG_ERR_EOF) + if (gpgme_err_code (err) != GPG_ERR_EOF) fail_if_err (err); err = gpgme_op_keylist_end (ctx); fail_if_err (err); diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h index 6e282a34..6a18b5cb 100644 --- a/tests/gpg/t-support.h +++ b/tests/gpg/t-support.h @@ -143,7 +143,7 @@ print_import_result (gpgme_import_result_t r) for (st=r->imports; st; st = st->next) { printf (" fpr: %s err: %d (%s) status:", nonnull (st->fpr), - st->result, gpg_strerror (st->result)); + st->result, gpgme_strerror (st->result)); if (st->status & GPGME_IMPORT_NEW) fputs (" new", stdout); if (st->status & GPGME_IMPORT_UID) diff --git a/tests/gpg/t-trustlist.c b/tests/gpg/t-trustlist.c index 77076392..5d245188 100644 --- a/tests/gpg/t-trustlist.c +++ b/tests/gpg/t-trustlist.c @@ -56,7 +56,7 @@ main (int argc, char *argv[]) item->validity, item->name); gpgme_trust_item_unref (item); } - if (gpg_err_code (err) != GPG_ERR_EOF) + if (gpgme_err_code (err) != GPG_ERR_EOF) fail_if_err (err); gpgme_release (ctx); diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c index 0efd06ff..dceabac5 100644 --- a/tests/gpg/t-verify.c +++ b/tests/gpg/t-verify.c @@ -117,10 +117,10 @@ check_result (gpgme_verify_result_t result, unsigned int summary, char *fpr, __FILE__, __LINE__, sig->fpr); exit (1); } - if (gpg_err_code (sig->status) != status) + if (gpgme_err_code (sig->status) != status) { fprintf (stderr, "%s:%i: Unexpected signature status: %s\n", - __FILE__, __LINE__, gpg_strerror (sig->status)); + __FILE__, __LINE__, gpgme_strerror (sig->status)); exit (1); } if (notation) @@ -192,7 +192,7 @@ check_result (gpgme_verify_result_t result, unsigned int summary, char *fpr, __FILE__, __LINE__, sig->validity); exit (1); } - if (gpg_err_code (sig->validity_reason) != GPG_ERR_NO_ERROR) + if (gpgme_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)); @@ -259,7 +259,7 @@ main (int argc, char *argv[]) err = gpgme_data_new (&text); fail_if_err (err); err = gpgme_op_verify (ctx, sig, NULL, text); - if (gpg_err_code (err) != GPG_ERR_BAD_DATA) + if (gpgme_err_code (err) != GPG_ERR_BAD_DATA) { fprintf (stderr, "%s:%i: Double plaintext message not detected\n", __FILE__, __LINE__); diff --git a/tests/gpg/t-wait.c b/tests/gpg/t-wait.c index eec4d96d..e58adade 100644 --- a/tests/gpg/t-wait.c +++ b/tests/gpg/t-wait.c @@ -61,7 +61,7 @@ main (int argc, char *argv[]) while (gpgme_wait (ctx, &err, 0) == NULL && err == 0) sleep(1); - if (gpg_err_code (err) != GPG_ERR_NO_DATA) + if (gpgme_err_code (err) != GPG_ERR_NO_DATA) { fprintf (stderr, "%s:%d: %s: %s\n", __FILE__, __LINE__, gpgme_strsource (err), |