From dae3073aaa8b7feb1c844fdaf711f79141b9cc65 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 8 Feb 2012 15:26:17 +0100 Subject: Use gpgme interface for error handling to avoid linking with gpg-error. * tests/t-data.c, tests/run-export.c, tests/run-keylist.c, tests/run-support.h, tests/run-verify.c, tests/gpg/t-decrypt-verify.c, tests/gpg/t-edit.c, tests/gpg/t-eventloop.c, tests/gpg/t-keylist-sig.c, tests/gpg/t-keylist.c, tests/gpg/t-support.h, tests/gpg/t-trustlist.c, tests/gpg/t-verify.c, tests/gpg/t-wait.c, tests/gpgsm/cms-decrypt.c, tests/gpgsm/cms-keylist.c, tests/gpgsm/t-keylist.c, tests/gpgsm/t-support.h, tests/gpgsm/t-verify.c, tests/opassuan/t-command.c: Use gpgme interface for gpg-error functions. --- tests/gpgsm/t-support.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/gpgsm/t-support.h') diff --git a/tests/gpgsm/t-support.h b/tests/gpgsm/t-support.h index 6dc14569..cc1a7db9 100644 --- a/tests/gpgsm/t-support.h +++ b/tests/gpgsm/t-support.h @@ -32,9 +32,9 @@ if (err) \ { \ fprintf (stderr, "%s:%d: %s: %s (%d.%d)\n", \ - __FILE__, __LINE__, gpg_strsource (err), \ - gpg_strerror (err), \ - gpg_err_source (err), gpg_err_code (err)); \ + __FILE__, __LINE__, gpgme_strsource (err), \ + gpgme_strerror (err), \ + gpgme_err_source (err), gpgme_err_code (err)); \ exit (1); \ } \ } \ @@ -50,11 +50,11 @@ print_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, BUF_SIZE)) > 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)); } -- cgit v1.2.3