X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_odr.c;h=7f5ef9e6c619f668c00b3d83854ae800e5a9066c;hp=af4a1d43a6fb6897481853db233e156ea9925dbb;hb=7143bc8f77ac03fdb6f36f30b16cf64c2d6cc3e2;hpb=d0e351c12fff564d876958e860338d43716dc269 diff --git a/test/test_odr.c b/test/test_odr.c index af4a1d4..7f5ef9e 100644 --- a/test/test_odr.c +++ b/test/test_odr.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ #if HAVE_CONFIG_H @@ -25,20 +25,19 @@ void tst_MySequence1(ODR encode, ODR decode) YAZ_CHECK(s); s->first = odr_intdup(encode, 12345); s->second = (Odr_oct *) odr_malloc(encode, sizeof(*s->second)); - s->second->buf = (unsigned char *) "hello"; + s->second->buf = (char *) "hello"; s->second->len = 5; - s->second->size = 0; s->third = odr_booldup(encode, 1); s->fourth = odr_nullval(); s->fifth = odr_intdup(encode, YC_MySequence_enum1); - + s->myoid = odr_getoidbystr(decode, MYOID); ret = yc_MySequence(encode, &s, 0, 0); YAZ_CHECK(ret); if (!ret) return; - + ber_buf = odr_getbuf(encode, &ber_len, 0); odr_setbuf(decode, ber_buf, ber_len, 0); @@ -80,9 +79,8 @@ void tst_MySequence2(ODR encode, ODR decode) YAZ_CHECK(s); s->first = 0; /* deliberately miss this .. */ s->second = (Odr_oct *) odr_malloc(encode, sizeof(*s->second)); - s->second->buf = (unsigned char *) "hello"; + s->second->buf = (char *) "hello"; s->second->len = 5; - s->second->size = 0; s->third = odr_booldup(encode, 1); s->fourth = odr_nullval(); s->fifth = odr_intdup(encode, YC_MySequence_enum1); @@ -130,7 +128,7 @@ static void tst_berint32(ODR encode, ODR decode) Odr_int val; Odr_int ret_val; int r; - + val = 0; odr_reset(encode); r = ber_integer(encode, &val); @@ -253,7 +251,7 @@ static void tst_berint64(ODR encode, ODR decode) Odr_int val; Odr_int ret_val; int r; - + val = (Odr_int) 2 * 2147483648UL; /* 2^32 */ odr_reset(encode); r = ber_integer(encode, &val); @@ -340,7 +338,7 @@ void do_nothing_useful(Odr_int value) Odr_int *valp, *resvalp; char *bufferp; int len; - + /* allocate streams */ if (!(encode = odr_createmem(ODR_ENCODE))) return;