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.

1 files changed, 7 insertions, 18 deletions

diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index df0c9dfd..74d333f4 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -24,18 +24,7 @@
 
 #include <gpgme.h>
 
-
-#define fail_if_err(err)					\
-  do								\
-    {								\
-      if (err)							\
-        {							\
-          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
-                   __FILE__, __LINE__, gpgme_strerror (err));   \
-          exit (1);						\
-        }							\
-    }								\
-  while (0)
+#include "t-support.h"
 
 
 static const char test_text1[] = "Just GNU it!\n";
@@ -106,10 +95,10 @@ 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));
+	       __FILE__, __LINE__, gpg_strerror (sig->status));
       exit (1);
     }
   if (notation)
@@ -145,7 +134,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));
@@ -174,7 +163,7 @@ main (int argc, char *argv[])
   fail_if_err (err);
   result = gpgme_op_verify_result (ctx);
   check_result (result, 0, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-		GPGME_No_Error, 1);
+		GPG_ERR_NO_ERROR, 1);
 
   /* Checking a manipulated message.  */
   gpgme_data_release (text);
@@ -185,7 +174,7 @@ main (int argc, char *argv[])
   fail_if_err (err);
   result = gpgme_op_verify_result (ctx);
   check_result (result, GPGME_SIGSUM_RED, "2D727CC768697734",
-		GPGME_Bad_Signature, 0);
+		GPG_ERR_BAD_SIGNATURE, 0);
 
   /* Checking a normal signature.  */
   gpgme_data_release (sig);
@@ -198,7 +187,7 @@ main (int argc, char *argv[])
   fail_if_err (err);
   result = gpgme_op_verify_result (ctx);
   check_result (result, 0, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-		GPGME_No_Error, 0);
+		GPG_ERR_NO_ERROR, 0);
 
   gpgme_data_release (sig);
   gpgme_data_release (text);