Use gpgme interface for error handling to avoid linking with gpg-error.

[gpgme.git] / tests / gpg / t-trustlist.c

diff --git a/tests/gpg/t-trustlist.c b/tests/gpg/t-trustlist.c
index d7c6bc8c569111740b17ab4eff0363f3cfe28228..5d2451883392905222f803da9205b53e1670df1e 100644 (file)
--- a/tests/gpg/t-trustlist.c
+++ b/tests/gpg/t-trustlist.c
@@ -1,22 +1,29 @@
 /* t-trustlist.c - Regression test.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2003 g10 Code GmbH
+   Copyright (C) 2001, 2003, 2004 g10 Code GmbH
 
    This file is part of GPGME.
  
    GPGME is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
- 
+   under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+   
    GPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with GPGME; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+/* We need to include config.h so that we know whether we are building
+   with large file system (LFS) support. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,20 +31,9 @@
 
 #include <gpgme.h>
 
-\f
-#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"
 
+\f
 int 
 main (int argc, char *argv[])
 {
@@ -45,12 +41,14 @@ main (int argc, char *argv[])
   gpgme_error_t err;
   gpgme_trust_item_t item;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 
   err = gpgme_op_trustlist_start (ctx, "alice", 0);
   fail_if_err (err);
-  
+
   while (!(err = gpgme_op_trustlist_next (ctx, &item)))
     {
       printf ("l=%d k=%s t=%d o=%s v=%s u=%s\n",
@@ -58,7 +56,7 @@ main (int argc, char *argv[])
              item->validity, item->name);
       gpgme_trust_item_unref (item);
     }
-  if (err != GPGME_EOF)
+  if (gpgme_err_code (err) != GPG_ERR_EOF)
     fail_if_err (err);
 
   gpgme_release (ctx);