X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=8e7d85de67da6eebe1f1056100a5db007f3b7b2a;hb=5381b2f81bb793e364cd5b2a910e026ce84d9d05;hp=76e3b05a2d059cc0e2ce1b6041ea1f53691e3c8f;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index 76e3b05..8e7d85d 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -3,7 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: odr_null.c,v 1.15 2003-01-06 08:20:27 adam Exp $
+ * $Id: odr_null.c,v 1.17 2003-05-20 19:55:30 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -26,10 +26,10 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_NULL;
     }
-    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 (o->direction == ODR_PRINT)
     {
 	odr_prname(o, name);
@@ -39,7 +39,7 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
     if (cons)
     {
 #ifdef ODR_STRICT_NULL
-    	o->error = OPROTO;
+        odr_seterror(OPROTO, 42);
     	return 0;
 #else
 	fprintf(stderr, "odr: Warning: Bad NULL\n");