/*
- * 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_oct.c,v $
- * Revision 1.6 1995-02-10 18:57:26 quinn
+ * Revision 1.10 1995-09-27 15:02:59 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9 1995/05/16 08:50:56 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.8 1995/03/17 10:17:54 quinn
+ * Added memory management.
+ *
+ * Revision 1.7 1995/03/08 12:12:27 quinn
+ * Added better error checking.
+ *
+ * Revision 1.6 1995/02/10 18:57:26 quinn
* More in the way of error-checking.
*
* Revision 1.5 1995/02/09 15:51:49 quinn
* Top level octet string en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_octetstring(ODR o, Odr_oct **p, int opt)
+int MDF odr_octetstring(ODR o, Odr_oct **p, int opt)
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
- 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;
}
if (o->direction == ODR_DECODE)
{
- *p = nalloc(o, sizeof(Odr_oct));
+ *p = odr_malloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
}
if (ber_octetstring(o, *p, cons))
return 1;
- *p = 0;
+ o->error = OOTHER;
return 0;
}
/*
* Friendlier interface to octetstring.
*/
-int odr_cstring(ODR o, char **p, int opt)
+int MDF odr_cstring(ODR o, char **p, int opt)
{
int cons = 0, res;
Odr_oct *t;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
- 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;
fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
- t = nalloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
+ t = odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;