Minor fix.

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

diff --git a/odr/odr_null.c b/odr/odr_null.c
index a6985f2..af15eba 100644 (file)
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,10 +1,38 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-1997, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.1  1995-02-02 16:21:54  quinn
+ * Revision 1.10  1997-11-24 11:33:56  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.9  1995/10/18 16:12:56  quinn
+ * Better diagnostics. Added special case in NULL to handle WAIS server.
+ *
+ * Revision 1.8  1995/09/29  17:12:24  quinn
+ * Smallish
+ *
+ * Revision 1.7  1995/09/27  15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/22  11:32:03  quinn
+ * Fixing Interface to odr_null.
+ *
+ * Revision 1.5  1995/05/16  08:50:56  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/03/08  12:12:26  quinn
+ * Added better error checking.
+ *
+ * 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.
  *
  */
@@ -15,31 +43,36 @@
  * 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)
 {
     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)) < 0)
        return 0;
     if (!res)
-    {
-       *p = 0;
        return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
-       fprintf(o->print, "NULL\n");
+       fprintf(o->print, "%sNULL\n", odr_indent(o));
        return 1;
     }
     if (cons)
+    {
+#ifdef ODR_STRICT_NULL
+       o->error = OPROTO;
        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);
 }