/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_null.c,v $
- * Revision 1.3 1995-02-10 18:57:25 quinn
+ * 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
* 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 (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_NULL;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
return 0;
if (!res)
return opt;
return 1;
}
if (cons)
+ {
+ o->error = OPROTO;
return 0;
+ }
if (o->direction == ODR_DECODE)
- *p = &nullval;
- return ber_null(o, *p);
+ *p = ODR_NULLVAL;
+ return ber_null(o);
}