*** empty log message ***

[yaz-moved-to-github.git] / odr / test.c

diff --git a/odr/test.c b/odr/test.c
index 94e0aa9..894ef1b 100644 (file)
--- a/odr/test.c
+++ b/odr/test.c
@@ -1,13 +1,14 @@
 #include <stdio.h>
 #include <odr.h>
+#include <odr_use.h>
 
-typedef ODR_BITMASK Z_ReferenceId;
+typedef Odr_bitmask Z_ReferenceId;
 
 typedef struct Z_InitRequest
 {
     Z_ReferenceId *referenceId;    /* OPTIONAL */
-    ODR_BITMASK *options;
-    ODR_BITMASK *protocolVersion;
+    Odr_bitmask *options;
+    Odr_bitmask *protocolVersion;
     int *preferredMessageSize;
     int *maximumRecordSize;
     char *idAuthentication;      /* OPTIONAL */
@@ -18,7 +19,7 @@ typedef struct Z_InitRequest
 
 int z_ReferenceId(ODR o, Z_ReferenceId **p, int opt)
 {
-    return odr_implicit(o, odr_octetstring, (ODR_OCT**) p, ODR_CONTEXT, 2, opt);
+    return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
 }
 
 int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
@@ -54,10 +55,13 @@ int main()
     unsigned char buf[4048];
     struct odr o;
     Z_InitRequest ireq, *ireqp, *ireq2p;
-    ODR_BITMASK options, protocolVersion;
+    Odr_bitmask options, protocolVersion;
     char *iId = "YAZ", *iName = "Yet Another Z39.50 Implementation",
        *iVersion = "0.1";
     int maximumRS = 4096, preferredMS = 2048;
+    static Odr_oid oid[] = {1, 2, 3, 4, -1}, *oidp1, *oidp2;
+
+    oidp1 = oid;
 
     ODR_MASK_ZERO(&protocolVersion);
     ODR_MASK_SET(&protocolVersion, 0);
@@ -85,10 +89,10 @@ int main()
     o.direction = ODR_ENCODE;
     o.t_class = -1;
 
-    z_InitRequest(&o, &ireqp, 0);
+    odr_oid(&o, &oidp1, 0);
 
     o.direction = ODR_DECODE;
     o.bp = o.buf;
 
-    z_InitRequest(&o, &ireq2p, 0);
+    odr_oid(&o, &oidp2, 0);
 }