X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstodr.c;h=8aa01549aa4c3ec924633cba8cee7dfed77782fa;hb=7fb420029552be59a80c8deadb638b4b8780d5d8;hp=268224da99dc8f17882bc80e896a60d252576f96;hpb=06ae818deffa84ec4bc1308051ef411845dd4ce5;p=yaz-moved-to-github.git

diff --git a/test/tstodr.c b/test/tstodr.c
index 268224d..8aa0154 100644
--- a/test/tstodr.c
+++ b/test/tstodr.c
@@ -1,14 +1,10 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstodr.c,v 1.8 2006-01-29 21:59:13 adam Exp $
- *
  */
 #include <stdlib.h>
 #include <stdio.h>
-#include <yaz/odr.h>
-#include <yaz/oid.h>
+#include <yaz/oid_util.h>
 #include "tstodrcodec.h"
 
 #include <yaz/test.h>
@@ -20,12 +16,12 @@ void tst_MySequence1(ODR encode, ODR decode)
     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);
-    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;
@@ -67,7 +63,7 @@ void tst_MySequence1(ODR encode, ODR decode)
     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);
     }
@@ -76,11 +72,11 @@ void tst_MySequence1(ODR encode, ODR decode)
 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 .. */
-    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;
@@ -150,6 +146,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab