/*
- * Copyright (c) 1995, 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.7 1995-09-27 15:02:59 quinn
+ * 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.
+ *
+ * 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
* 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 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;
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);
}