X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_any.c;h=e464872985bc76f7fa538763538f77241b411d06;hb=29a22396d7d7b1219f5b83c35983c8fb1cd79e8f;hp=bb9effdb96a7f7203b36a27ac80a4dfbc411d2a1;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;p=yaz-moved-to-github.git

diff --git a/odr/odr_any.c b/odr/odr_any.c
index bb9effd..e464872 100644
--- a/odr/odr_any.c
+++ b/odr/odr_any.c
@@ -1,18 +1,15 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_any.c,v $
- * Revision 1.2  1995-03-08 12:12:18  quinn
- * Added better error checking.
- *
- * Revision 1.1  1995/02/09  15:51:47  quinn
- * Works better now.
- *
+ * $Id: odr_any.c,v 1.14 2003-05-20 19:55:30 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 /*
  * This is a catch-all type. It stuffs a random ostring (assumed to be properly
@@ -20,21 +17,20 @@
  * does not work, and neither does the optional flag, unless the element
  * is the last in a sequence.
  */
-int 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 = nalloc(o, sizeof(**p));
+    	*p = (Odr_oct *)odr_malloc(o, sizeof(**p));
     if (ber_any(o, p))
     	return 1;
     *p = 0;
-    if (!opt)
-    	o->error = OREQUIRED;
-    return opt;
-}    
+    return odr_missing(o, opt, name);
+}