X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=8e7d85de67da6eebe1f1056100a5db007f3b7b2a;hb=b0555501e434d0f71f97ea17f282db2e795ff950;hp=81584219daa1b61aeebecccdfcc5181033f01dca;hpb=569f86b4615c2731727be2a0ff898d36f9725819;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index 8158421..8e7d85d 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: odr_null.c,v 1.14 2002-07-25 12:51:08 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");