projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy new year
[idzebra-moved-to-github.git]
/
util
/
tstcharmap.c
diff --git
a/util/tstcharmap.c
b/util/tstcharmap.c
index
5f92923
..
9c85c96
100644
(file)
--- a/
util/tstcharmap.c
+++ b/
util/tstcharmap.c
@@
-1,8
+1,5
@@
-/* $Id: tstcharmap.c,v 1.7 2007-01-15 15:10:26 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2009 Index Data
Zebra 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
Zebra 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
@@
-20,11
+17,9
@@
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 <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(void)
/* use env srcdir as base directory - or current directory if unset */
const char *get_srcdir(void)
@@
-42,9
+37,7
@@
void tst1(void)
chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
"tstcharmap.chr" /* file */,
0 /* tabroot */ );
chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
"tstcharmap.chr" /* file */,
0 /* tabroot */ );
- if (!tab)
- exit(1);
-
+ YAZ_CHECK(tab);
chrmaptab_destroy(tab);
}
chrmaptab_destroy(tab);
}
@@
-54,21
+47,19
@@
void tst2(void)
chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
"nonexist.chr" /* file */,
0 /* tabroot */ );
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)
{
}
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();
tst1();
tst2();
- exit(0);
+ YAZ_CHECK_TERM;
}
/*
}
/*