* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tsticonv.c,v 1.12 2005-10-28 18:36:59 adam Exp $
+ * $Id: tsticonv.c,v 1.13 2006-01-29 21:59:13 adam Exp $
*/
#if HAVE_CONFIG_H
#include <ctype.h>
#include <yaz/yaz-util.h>
+#include <yaz/test.h>
static int compare_buffers(char *msg, int no,
int expect_len, const char *expect_buf,
int got_len, const char *got_buf)
{
- int i;
if (expect_len == got_len
&& !memcmp(expect_buf, got_buf, expect_len))
return 1;
- printf("tsticonv test=%s i=%d failed\n", msg, no);
- printf("off got exp\n");
- for (i = 0; i<got_len || i<expect_len; i++)
+
+ if (0) /* use 1 see how the buffers differ (for debug purposes) */
{
- char got_char[10];
- char expect_char[10];
-
- if (i < got_len)
- sprintf(got_char, "%02X", got_buf[i]);
- else
- sprintf(got_char, "? ");
-
- if (i < expect_len)
- sprintf(expect_char, "%02X", expect_buf[i]);
- else
- sprintf(expect_char, "? ");
-
- printf("%02d %s %s %c\n",
- i, got_char, expect_char, got_buf[i] == expect_buf[i] ?
- ' ' : '*');
-
+ int i;
+ printf("tsticonv test=%s i=%d failed\n", msg, no);
+ printf("off got exp\n");
+ for (i = 0; i<got_len || i<expect_len; i++)
+ {
+ char got_char[10];
+ char expect_char[10];
+
+ if (i < got_len)
+ sprintf(got_char, "%02X", got_buf[i]);
+ else
+ sprintf(got_char, "? ");
+
+ if (i < expect_len)
+ sprintf(expect_char, "%02X", expect_buf[i]);
+ else
+ sprintf(expect_char, "? ");
+
+ printf("%02d %s %s %c\n",
+ i, got_char, expect_char, got_buf[i] == expect_buf[i] ?
+ ' ' : '*');
+
+ }
}
- exit(1);
+ return 0;
}
/* some test strings in ISO-8859-1 format */
{
int i;
yaz_iconv_t cd;
+ int ret;
cd = yaz_iconv_open("ISO-8859-1", "MARC8");
+ YAZ_CHECK(cd);
if (!cd)
- {
- printf("tsticonv 10 yaz_iconv_open failed\n");
- exit(10);
- }
+ return;
for (i = 0; iso_8859_1_a[i]; i++)
{
size_t r;
size_t outbytesleft = sizeof(outbuf0);
r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ YAZ_CHECK(r != (size_t)(-1));
if (r == (size_t) (-1))
- {
- int e = yaz_iconv_error(cd);
+ break;
- printf ("tsticonv 11 i=%d e=%d\n", i, e);
- exit(11);
- }
- compare_buffers("tsticonv 11", i,
- strlen(iso_8859_1_a[i]), iso_8859_1_a[i],
- outbuf - outbuf0, outbuf0);
+ ret = compare_buffers("tsticonv 11", i,
+ strlen(iso_8859_1_a[i]), iso_8859_1_a[i],
+ outbuf - outbuf0, outbuf0);
+ YAZ_CHECK(ret);
}
yaz_iconv_close(cd);
}
}
};
int i;
+ int ret;
yaz_iconv_t cd;
cd = yaz_iconv_open("UCS4", "MARC8");
+ YAZ_CHECK(cd);
if (!cd)
- {
- printf ("tsticonv 20 yaz_iconv_open failed\n");
- exit(20);
- }
+ return;
for (i = 0; ar[i].len; i++)
{
size_t r;
if (r == (size_t) (-1))
{
int e = yaz_iconv_error(cd);
+ YAZ_CHECK(e == YAZ_ICONV_E2BIG);
if (e != YAZ_ICONV_E2BIG)
- {
- printf ("tsticonv 21 i=%d e=%d\n", i, e);
- exit(21);
- }
+ return;
}
else
break;
}
- compare_buffers("tsticonv 22", i,
- expect_len, ar[i].ucs4_b,
- outbuf - outbuf0, outbuf0);
+ ret = compare_buffers("tsticonv 22", i,
+ expect_len, ar[i].ucs4_b,
+ outbuf - outbuf0, outbuf0);
+ YAZ_CHECK(ret);
}
yaz_iconv_close(cd);
}
};
int i;
+ int ret;
yaz_iconv_t cd;
cd = yaz_iconv_open("UTF8", "UCS4");
+ YAZ_CHECK(cd);
if (!cd)
- {
- printf ("tsticonv 30 yaz_iconv_open failed\n");
- exit(30);
- }
+ return;
for (i = 0; ucs4_c[i]; i++)
{
size_t r;
size_t outbytesleft = sizeof(outbuf0);
r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ YAZ_CHECK(r != (size_t) (-1));
if (r == (size_t) (-1))
- {
- int e = yaz_iconv_error(cd);
-
- printf ("tsticonv 31 i=%d e=%d\n", i, e);
- exit(31);
- }
- compare_buffers("tsticonv 32", i,
- strlen(utf8_c[i]), utf8_c[i],
- outbuf - outbuf0, outbuf0);
+ return;
+ ret = compare_buffers("tsticonv 32", i,
+ strlen(utf8_c[i]), utf8_c[i],
+ outbuf - outbuf0, outbuf0);
+ YAZ_CHECK(ret);
}
yaz_iconv_close(cd);
}
static void dconvert(int mandatory, const char *tmpcode)
{
int i;
+ int ret;
yaz_iconv_t cd;
for (i = 0; iso_8859_1_a[i]; i++)
{
size_t outbytesleft = sizeof(outbuf0);
cd = yaz_iconv_open(tmpcode, "ISO-8859-1");
+ YAZ_CHECK(cd || !mandatory);
if (!cd)
- {
- if (!mandatory)
- return;
- printf ("tsticonv code=%s i=%d 1\n", tmpcode, i);
- exit(1);
- }
+ return;
r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
- if (r == (size_t)(-1))
- {
- int e = yaz_iconv_error(cd);
-
- printf ("tsticonv code=%s i=%d 2 e=%d\n", tmpcode, i, e);
- exit(2);
- }
+ YAZ_CHECK(r != (size_t) (-1));
yaz_iconv_close(cd);
+ if (r == (size_t) (-1))
+ return;
cd = yaz_iconv_open("ISO-8859-1", tmpcode);
+ YAZ_CHECK(cd || !mandatory);
if (!cd)
- {
- if (!mandatory)
- return;
- printf ("tsticonv code=%s i=%d 3\n", tmpcode, i);
- exit(3);
- }
+ return;
inbuf = outbuf0;
inbytesleft = sizeof(outbuf0) - outbytesleft;
outbuf = outbuf1;
outbytesleft = sizeof(outbuf1);
r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
- if (r == (size_t)(-1)) {
- int e = yaz_iconv_error(cd);
-
- printf ("tsticonv code=%s i=%d 4 e=%d\n", tmpcode, i, e);
- exit(4);
+ YAZ_CHECK(r != (size_t) (-1));
+ if (r != (size_t)(-1))
+ {
+ ret = compare_buffers("dconvert", i,
+ strlen(iso_8859_1_a[i]), iso_8859_1_a[i],
+ sizeof(outbuf1) - outbytesleft, outbuf1);
+ YAZ_CHECK(ret);
}
- compare_buffers("dconvert", i,
- strlen(iso_8859_1_a[i]), iso_8859_1_a[i],
- sizeof(outbuf1) - outbytesleft, outbuf1);
yaz_iconv_close(cd);
}
}
int main (int argc, char **argv)
{
+ YAZ_CHECK_INIT(argc, argv);
dconvert(1, "UTF-8");
dconvert(1, "ISO-8859-1");
dconvert(1, "UCS4");
tst_marc8_to_iso_8859_1();
tst_marc8_to_ucs4b();
tst_ucs4b_to_utf8();
- exit(0);
+ YAZ_CHECK_TERM;
}
/*
* Local variables:
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
-
projects / yaz-moved-to-github.git / blobdiff