X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=81584219daa1b61aeebecccdfcc5181033f01dca;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=6525e271c27d878c4caffb95deba1b321da265c4;hpb=3d0077a6eb90bf1cf4d2ecc3acd1afaf7c829bd0;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index 6525e27..8158421 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,45 +1,21 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_null.c,v $
- * 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.
- *
+ * $Id: odr_null.c,v 1.14 2002-07-25 12:51:08 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, Odr_null **p, int opt)
+int odr_null(ODR o, Odr_null **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -56,7 +32,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)
@@ -69,6 +46,6 @@ int odr_null(ODR o, Odr_null **p, int opt)
 #endif
     }
     if (o->direction == ODR_DECODE)
-    	*p = ODR_NULLVAL;
+    	*p = odr_nullval();
     return ber_null(o);
 }