projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call autoheader when needed
[yaz-moved-to-github.git]
/
test
/
tstodr.c
diff --git
a/test/tstodr.c
b/test/tstodr.c
index
99f6992
..
4becfe0
100644
(file)
--- a/
test/tstodr.c
+++ b/
test/tstodr.c
@@
-1,13
+1,10
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: tstodr.c,v 1.10 2007-04-13 06:48:35 adam Exp $
- *
*/
#include <stdlib.h>
#include <stdio.h>
*/
#include <stdlib.h>
#include <stdio.h>
-#include <yaz/odr.h>
+#include <yaz/oid_util.h>
#include "tstodrcodec.h"
#include <yaz/test.h>
#include "tstodrcodec.h"
#include <yaz/test.h>
@@
-19,12
+16,12
@@
void tst_MySequence1(ODR encode, ODR decode)
int ret;
char *ber_buf;
int ber_len;
int ret;
char *ber_buf;
int ber_len;
- Yc_MySequence *s = odr_malloc(encode, sizeof(*s));
+ Yc_MySequence *s = (Yc_MySequence *) odr_malloc(encode, sizeof(*s));
Yc_MySequence *t;
YAZ_CHECK(s);
s->first = odr_intdup(encode, 12345);
Yc_MySequence *t;
YAZ_CHECK(s);
s->first = odr_intdup(encode, 12345);
- s->second = odr_malloc(encode, sizeof(*s->second));
+ s->second = (Odr_oct *) odr_malloc(encode, sizeof(*s->second));
s->second->buf = (unsigned char *) "hello";
s->second->len = 5;
s->second->size = 0;
s->second->buf = (unsigned char *) "hello";
s->second->len = 5;
s->second->size = 0;
@@
-66,7
+63,7
@@
void tst_MySequence1(ODR encode, ODR decode)
YAZ_CHECK(t->myoid);
if (t->myoid)
{
YAZ_CHECK(t->myoid);
if (t->myoid)
{
- int *myoid = odr_getoidbystr(decode, MYOID);
+ Odr_oid *myoid = odr_getoidbystr(decode, MYOID);
YAZ_CHECK(oid_oidcmp(myoid, t->myoid) == 0);
}
YAZ_CHECK(oid_oidcmp(myoid, t->myoid) == 0);
}
@@
-75,11
+72,11
@@
void tst_MySequence1(ODR encode, ODR decode)
void tst_MySequence2(ODR encode, ODR decode)
{
int ret;
void tst_MySequence2(ODR encode, ODR decode)
{
int ret;
- Yc_MySequence *s = odr_malloc(encode, sizeof(*s));
+ Yc_MySequence *s = (Yc_MySequence *) odr_malloc(encode, sizeof(*s));
YAZ_CHECK(s);
s->first = 0; /* deliberately miss this .. */
YAZ_CHECK(s);
s->first = 0; /* deliberately miss this .. */
- s->second = odr_malloc(encode, sizeof(*s->second));
+ s->second = (Odr_oct *) odr_malloc(encode, sizeof(*s->second));
s->second->buf = (unsigned char *) "hello";
s->second->len = 5;
s->second->size = 0;
s->second->buf = (unsigned char *) "hello";
s->second->len = 5;
s->second->size = 0;