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, 5 insertions, 34 deletions

diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index fd275080..3733d5c6 100644
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -25,38 +25,9 @@
 
 #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)
-
-
-static char *
-mk_fname (const char *fname)
-{
-  const char *srcdir = getenv ("srcdir");
-  char *buf;
-
-  if (!srcdir)
-    srcdir = ".";
-  buf = malloc (strlen(srcdir) + strlen(fname) + 2);
-  if (!buf) 
-    exit (8);
-  strcpy (buf, srcdir);
-  strcat (buf, "/");
-  strcat (buf, fname);
-  return buf;
-}
-
+#include "t-support.h"
 
+
 void
 check_result (gpgme_import_result_t result, char *fpr, int secret)
 {
@@ -223,14 +194,14 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
 
 
 int 
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in;
   gpgme_import_result_t result;
-  const char *pubkey_1_asc = mk_fname ("pubkey-1.asc");
-  const char *seckey_1_asc = mk_fname ("seckey-1.asc");
+  const char *pubkey_1_asc = make_filename ("pubkey-1.asc");
+  const char *seckey_1_asc = make_filename ("seckey-1.asc");
 
   err = gpgme_new (&ctx);
   fail_if_err (err);