X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_use.c;h=7fca63b4ff28fe5db637eb163561658b5ee8dedb;hb=f45eb9a4844db2509e24e38a043625310c1e32a1;hp=4d69073ea0772d5fdde0f0e0824c93c6be353c3f;hpb=82c1521f196b83c0ede4200b21eb25ed86bbf48e;p=yaz-moved-to-github.git

diff --git a/odr/odr_use.c b/odr/odr_use.c
index 4d69073..7fca63b 100644
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_use.c,v $
- * Revision 1.1  1995-02-03 17:04:39  quinn
+ * Revision 1.3  1995-05-16 08:51:00  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/02/09  15:51:50  quinn
+ * Works better now.
+ *
+ * Revision 1.1  1995/02/03  17:04:39  quinn
  * Initial revision
  *
  */
@@ -15,7 +21,14 @@
 int odr_external(ODR o, Odr_external **p, int opt)
 {
     Odr_external *pp;
-    
+    static Odr_arm arm[] =
+    {
+    	{ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, odr_any},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, odr_octetstring},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, odr_bitstring},
+    	{-1, -1, -1, -1, 0}
+    };
+
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
     if (!odr_sequence_begin(o, p, sizeof(Odr_external)))
     	return opt;
@@ -24,8 +37,7 @@ int odr_external(ODR o, Odr_external **p, int opt)
     	odr_oid(o, &pp->direct_reference, 1) &&
     	odr_integer(o, &pp->indirect_reference, 1) &&
     	odr_graphicstring(o, &pp->descriptor, 1) &&
-	odr_implicit(o, odr_octetstring, &pp->octet_aligned, ODR_CONTEXT,
-	    1, 0) &&
+    	odr_choice(o, arm, &pp->u, &pp->which) &&
 	odr_sequence_end(o);
 }