/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_null.c,v $
- * Revision 1.5 1995-05-16 08:50:56 quinn
+ * 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
+ * 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
* Top level null en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_null(ODR o, int **p, int opt)
+int odr_null(ODR o, Odr_null **p, int opt)
{
int res, cons = 0;
- static int nullval = 0;
if (o->error)
return 0;
}
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 = &nullval;
- return ber_null(o, *p);
+ *p = odr_nullval();
+ return ber_null(o);
}