/*
- * 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: ber_oct.c,v $
- * Revision 1.5 1995-03-08 12:12:10 quinn
+ * Revision 1.8 1995-05-16 08:50:47 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.7 1995/04/18 08:15:17 quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.6 1995/03/17 10:17:41 quinn
+ * Added memory management.
+ *
+ * Revision 1.5 1995/03/08 12:12:10 quinn
* Added better error checking.
*
* Revision 1.4 1995/02/10 15:55:28 quinn
}
if (len + 1 > p->size - p->len)
{
- c = nalloc(o, p->size += len + 1);
+ c = odr_malloc(o, p->size += len + 1);
if (p->len)
memcpy(c, p->buf, p->len);
p->buf = c;
o->left -= len;
return 1;
case ODR_ENCODE:
- if ((res = ber_enclen(o->bp, p->len, 5, 0)) < 0)
- {
- o->error = OOTHER;
+ if ((res = ber_enclen(o, p->len, 5, 0)) < 0)
return 0;
- }
- o->bp += res;
- o->left -= res;
if (p->len == 0)
return 1;
- if (p->len > o->left)
- {
- o->error = OSPACE;
+ if (odr_write(o, p->buf, p->len) < 0)
return 0;
- }
- memcpy(o->bp, p->buf, p->len);
- o->bp += p->len;
- o->left -= p->len;
return 1;
case ODR_PRINT: return 1;
default: o->error = OOTHER; return 0;