X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_use.c;h=324bc7d613a1f0074dc3d40d06b1c6f32d4d97c2;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=d983de2f84fa3ccbbbe0796aa3955434ed68d38e;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_use.c b/odr/odr_use.c
index d983de2..324bc7d 100644
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,10 +1,28 @@
 /*
- * 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.2  1995-02-09 15:51:50  quinn
+ * Revision 1.8  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7  1995/09/29 17:12:27  quinn
+ * Smallish
+ *
+ * Revision 1.6  1995/09/27  15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/08/10  08:54:47  quinn
+ * Added Explain.
+ *
+ * Revision 1.4  1995/06/16  13:16:12  quinn
+ * Fixed Defaultdiagformat.
+ *
+ * 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
@@ -20,9 +38,9 @@ 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},
+    	{ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, (Odr_fun)odr_any},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, (Odr_fun)odr_octetstring},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, (Odr_fun)odr_bitstring},
     	{-1, -1, -1, -1, 0}
     };
 
@@ -44,8 +62,24 @@ int odr_visiblestring(ODR o, char **p, int opt)
     	opt);
 }    
 
+/*
+ * a char may not be sufficient to hold a general string, but we'll deal
+ * with that once we start looking more closely at UniCode & co.
+ */
+int odr_generalstring(ODR o, char **p, int opt)
+{
+    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALSTRING,
+    	opt);
+}    
+
 int odr_graphicstring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GRAPHICSTRING,
     	opt);
 }    
+
+int odr_generalizedtime(ODR o, char **p, int opt)
+{
+    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALIZEDTIME,
+    	opt);
+}