X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_any.c;h=9331bf867c80e4a5b1716822b66d77198ea6ade3;hb=9a13337111b32d256182a4248f93ebe26e393059;hp=81edb96ec22425f386193d8ae8352d4315da1068;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/odr_any.c b/odr/odr_any.c
index 81edb96..9331bf8 100644
--- a/odr/odr_any.c
+++ b/odr/odr_any.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_any.c,v $
- * Revision 1.5  1995-09-27 15:02:58  quinn
+ * Revision 1.10  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.9  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.8  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.7  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6  1995/09/29 17:12:22  quinn
+ * Smallish
+ *
+ * Revision 1.5  1995/09/27  15:02:58  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.4  1995/05/16  08:50:50  quinn
@@ -20,8 +36,11 @@
  * Works better now.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 /*
  * This is a catch-all type. It stuffs a random ostring (assumed to be properly
@@ -29,17 +48,18 @@
  * does not work, and neither does the optional flag, unless the element
  * is the last in a sequence.
  */
-int MDF odr_any(ODR o, Odr_any **p, int opt)
+int odr_any(ODR o, Odr_any **p, int opt, const char *name)
 {
     if (o->error)
     	return 0;
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%sANY (len=%d)\n", odr_indent(o), (*p)->len);
+	odr_prname(o, name);
+    	fprintf(o->print, "ANY (len=%d)\n", (*p)->len);
     	return 1;
     }
     if (o->direction == ODR_DECODE)
-    	*p = odr_malloc(o, sizeof(**p));
+    	*p = (Odr_oct *)odr_malloc(o, sizeof(**p));
     if (ber_any(o, p))
     	return 1;
     *p = 0;