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

diff --git a/odr/odr_any.c b/odr/odr_any.c
index b5a1dcd..e464872 100644
--- a/odr/odr_any.c
+++ b/odr/odr_any.c
@@ -1,40 +1,15 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_any.c,v $
- * 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
- * License, documentation, and memory fixes
- *
- * Revision 1.3  1995/03/17  10:17:46  quinn
- * Added memory management.
- *
- * 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 <yaz/odr.h>
+#include "odr-priv.h"
 
 /*
  * This is a catch-all type. It stuffs a random ostring (assumed to be properly
@@ -57,7 +32,5 @@ int odr_any(ODR o, Odr_any **p, int opt, const char *name)
     if (ber_any(o, p))
     	return 1;
     *p = 0;
-    if (!opt)
-    	o->error = OREQUIRED;
-    return opt;
-}    
+    return odr_missing(o, opt, name);
+}