X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=8524f8fac299ad2b1707d3d1e58e909d57402cf4;hb=8bccad6217bd2ba078106a531a9e73e7f3aae4a9;hp=2db79527212103179937a513e0e83c8177a3d029;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index 2db7952..8524f8f 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,50 +1,51 @@
 /*
- * 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_null.c,v $
- * Revision 1.2  1995-02-09 15:51:49  quinn
- * Works better now.
- *
- * Revision 1.1  1995/02/02  16:21:54  quinn
- * First kick.
- *
+ * $Id: odr_null.c,v 1.16 2003-03-11 11:03:31 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 /*
  * Top level null en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_null(ODR o, int **p, int opt)
+int odr_null(ODR o, Odr_null **p, int opt, const char *name)
 {
     int res, cons = 0;
-    static int nullval = 0;
 
+    if (o->error)
+    	return 0;
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_NULL;
     }
-    if (o->direction == ODR_DECODE)
-    	*p =0;
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
     	return 0;
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%sNULL\n", odr_indent(o));
+	odr_prname(o, name);
+    	fprintf(o->print, "NULL\n");
     	return 1;
     }
     if (cons)
+    {
+#ifdef ODR_STRICT_NULL
+        odr_seterror(OPROTO, 42);
     	return 0;
+#else
+	fprintf(stderr, "odr: Warning: Bad NULL\n");
+#endif
+    }
     if (o->direction == ODR_DECODE)
-    	*p = &nullval;
-    return ber_null(o, *p);
+    	*p = odr_nullval();
+    return ber_null(o);
 }