X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_use.c;h=99141d6282230abf3fbe9e8cdb7b7d2aabd08d9b;hp=25a178dc77bf139bfafa18e88a2ea35ba3838985;hb=19af2bd8dfd21731cc978beccd1346133d614c67;hpb=63cafe41a93427118959a74201b3e331169a71d9

diff --git a/odr/odr_use.c b/odr/odr_use.c
index 25a178d..99141d6 100644
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_use.c,v $
- * Revision 1.7  1995-09-29 17:12:27  quinn
+ * Revision 1.11  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * 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
@@ -26,57 +39,62 @@
  * Initial revision
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <odr_use.h>
+#include <yaz/odr.h>
 
-int odr_external(ODR o, Odr_external **p, int opt)
+int odr_external(ODR o, Odr_external **p, int opt, const char *name)
 {
     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_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, 
+	 (Odr_fun)odr_any, "single"},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet,
+	 (Odr_fun)odr_octetstring, "octet"},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary,
+	 (Odr_fun)odr_bitstring, "arbitrary"},
+    	{-1, -1, -1, -1, 0, 0}
     };
 
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
-    if (!odr_sequence_begin(o, p, sizeof(Odr_external)))
+    if (!odr_sequence_begin(o, p, sizeof(Odr_external), name))
     	return opt;
     pp = *p;
     return
-    	odr_oid(o, &pp->direct_reference, 1) &&
-    	odr_integer(o, &pp->indirect_reference, 1) &&
-    	odr_graphicstring(o, &pp->descriptor, 1) &&
-    	odr_choice(o, arm, &pp->u, &pp->which) &&
+    	odr_oid(o, &pp->direct_reference, 1, "direct") &&
+    	odr_integer(o, &pp->indirect_reference, 1, "indirect") &&
+    	odr_graphicstring(o, &pp->descriptor, 1, "descriptor") &&
+    	odr_choice(o, arm, &pp->u, &pp->which, 0) &&
 	odr_sequence_end(o);
 }
 
-int odr_visiblestring(ODR o, char **p, int opt)
+int odr_visiblestring(ODR o, char **p, int opt, const char *name)
 {
-    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_VISIBLESTRING,
-    	opt);
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			    ODR_VISIBLESTRING, opt, name);
 }    
 
 /*
  * 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)
+int odr_generalstring(ODR o, char **p, int opt, const char *name)
 {
-    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALSTRING,
-    	opt);
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			    ODR_GENERALSTRING,opt, name);
 }    
 
-int odr_graphicstring(ODR o, char **p, int opt)
+int odr_graphicstring(ODR o, char **p, int opt, const char *name)
 {
-    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GRAPHICSTRING,
-    	opt);
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			ODR_GRAPHICSTRING, opt, name);
 }    
 
-int odr_generalizedtime(ODR o, char **p, int opt)
+int odr_generalizedtime(ODR o, char **p, int opt, const char *name)
 {
-    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALIZEDTIME,
-    	opt);
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			    ODR_GENERALIZEDTIME, opt, name);
 }