X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=eb43bfefb6b94fc1d13674a99061ba7941aae6a8;hb=045c1b65972cd05508ff188e201c17e5da571b43;hp=af15ebaefd6ba978e19d5471a49f5c58a972e3f0;hpb=28231d4c83085109d800c6689ae778cc041c51e7;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index af15eba..eb43bfe 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.10  1997-11-24 11:33:56  adam
+ * Revision 1.13  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.12  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * 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.
  *
@@ -36,14 +46,17 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 /*
  * Top level null en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int 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;
 
@@ -60,7 +73,8 @@ int 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)