Improved installation. Moved header files to include/yaz.

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

diff --git a/odr/odr_null.c b/odr/odr_null.c
index af15eba..35d6628 100644 (file)
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (c) 1995-1997, 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.10  1997-11-24 11:33:56  adam
+ * 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.
  *
@@ -37,13 +44,13 @@
  *
  */
 
-#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 +67,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)