X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=de285faf6b6050086e389ce27d62e687603248fd;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hp=ac26999c3d568f3d92b2d91d91e4efaf18b011e3;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index ac26999..de285fa 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,10 +1,24 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.7  1995-09-27 15:02:59  quinn
+ * Revision 1.11  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * 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
@@ -33,7 +47,7 @@
  * Top level null en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int MDF odr_null(ODR o, Odr_null **p, int opt)
+int odr_null(ODR o, Odr_null **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -50,15 +64,20 @@ int MDF odr_null(ODR o, Odr_null **p, int opt)
     	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
     	o->error = OPROTO;
     	return 0;
+#else
+	fprintf(stderr, "odr: Warning: Bad NULL\n");
+#endif
     }
     if (o->direction == ODR_DECODE)
-    	*p = ODR_NULLVAL;
+    	*p = odr_nullval();
     return ber_null(o);
 }