Better ODR diagnostics for missing elements which includes additional

[yaz-moved-to-github.git] / odr / odr_null.c

diff --git a/odr/odr_null.c b/odr/odr_null.c
index a80a2ac..8e7d85d 100644 (file)
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,48 +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.3  1995-02-10 18:57:25  quinn
- * More in the way of error-checking.
- *
- * 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.17 2003-05-20 19:55:30 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 ((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, name)) < 0)
        return 0;
     if (!res)
-       return opt;
+       return odr_missing(o, opt, name);
     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);
 }