X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_oid.c;h=4077f3633342c79fc4f860b058def6552bf3bdbf;hp=7d147f2b54173014550bc61e67557995d1d3ce47;hb=ec1f815d5348cd21e393f76bc212c910c34bbc45;hpb=e147ddf129696b470aed3cfcdb405af84ee56ef6

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 7d147f2..4077f36 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,57 +1,16 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_oid.c,v $
- * Revision 1.14  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.13  1998/02/11 11:53:34  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.12  1995/09/29 17:12:25  quinn
- * Smallish
- *
- * Revision 1.11  1995/09/27  15:03:00  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.10  1995/05/29  08:11:44  quinn
- * Moved oid from odr/asn to util.
- *
- * Revision 1.9  1995/05/16  08:50:57  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.8  1995/03/17  10:17:55  quinn
- * Added memory management.
- *
- * Revision 1.7  1995/03/08  12:12:29  quinn
- * Added better error checking.
- *
- * Revision 1.6  1995/03/01  08:40:56  quinn
- * Smallish changes.
- *
- * Revision 1.5  1995/02/10  18:57:26  quinn
- * More in the way of error-checking.
- *
- * Revision 1.4  1995/02/10  15:55:29  quinn
- * Bug fixes, mostly.
- *
- * Revision 1.3  1995/02/09  15:51:49  quinn
- * Works better now.
- *
- * Revision 1.2  1995/02/07  14:13:46  quinn
- * Bug fixes.
- *
- * Revision 1.1  1995/02/03  17:04:38  quinn
- * Initial revision
- *
- *
+ * $Id: odr_oid.c,v 1.20 2003-05-20 19:55:30 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <oid.h>
+#include "odr-priv.h"
+#include <yaz/oid.h>
 
 /*
  * Top level oid en/decoder.
@@ -68,13 +27,13 @@ int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_OID;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
     	return 0;
     if (!res)
-    	return opt;
+    	return odr_missing(o, opt, name);
     if (cons)
     {
-    	o->error = OPROTO;
+        odr_seterror(o, OPROTO, 46);
 	return 0;
     }
     if (o->direction == ODR_PRINT)