X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Ftstcharmap.c;h=cefedc30a28862f8ceec62757beb2f6ff37cc15a;hb=707cc9ebfa7f462ec58a31cfbad4c1a09fecfa00;hp=da7151af6372b5be64385e36710bba061bc1a736;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git

diff --git a/util/tstcharmap.c b/util/tstcharmap.c
index da7151a..cefedc3 100644
--- a/util/tstcharmap.c
+++ b/util/tstcharmap.c
@@ -1,5 +1,5 @@
-/* $Id: tstcharmap.c,v 1.5 2006-08-14 10:40:34 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: tstcharmap.c,v 1.9 2007-05-21 07:15:06 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -20,14 +20,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
 #include <charmap.h>
-#include <yaz/log.h>
+#include <yaz/test.h>
+#include <stdlib.h>
 
 /* use env srcdir as base directory - or current directory if unset */
-const char *get_srcdir()
+const char *get_srcdir(void)
 {
     const char *srcdir = getenv("srcdir");
     if (!srcdir || ! *srcdir)
@@ -36,39 +34,35 @@ const char *get_srcdir()
 
 }
 
-void tst1()
+void tst1(void)
 {
     /* open existing map chrmaptab.chr */
     chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
 				     "tstcharmap.chr" /* file */,
 				     0 /* tabroot */ );
-    if (!tab)
-	exit(1);
-    
+    YAZ_CHECK(tab);
     chrmaptab_destroy(tab);
 }
 
-void tst2()
+void tst2(void)
 {
     /* open non-existing nonexist.chr */
     chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
 				     "nonexist.chr" /* file */,
 				     0 /* tabroot */ );
-    
-    if (tab)
-	exit(0);
+    YAZ_CHECK(!tab);
+    chrmaptab_destroy(tab);
 }
 
 int main(int argc, char **argv)
 {
-    char logname[2048];
-    sprintf(logname, "%s.log", argv[0]);
-    yaz_log_init_file(logname);
+    YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
 
     tst1();
     tst2();
 
-    exit(0);
+    YAZ_CHECK_TERM;
 }
 
 /*