/*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
- * Revision 1.12 1999-01-08 11:23:24 adam
+ * Revision 1.16 2000-02-29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15 2000/01/31 13:15:21 adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.14 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.13 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.12 1999/01/08 11:23:24 adam
* Added const modifier to some of the BER/ODR encoding routines.
*
* Revision 1.11 1998/02/11 11:53:34 adam
* First kick.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include <yaz/odr.h>
int ber_octetstring(ODR o, Odr_oct *p, int cons)
{
return 0;
}
o->bp += res;
- o->left -= res;
if (cons) /* fetch component strings */
{
base = o->bp;
while (odp_more_chunks(o, base, len))
- if (!odr_octetstring(o, &p, 0))
+ if (!odr_octetstring(o, &p, 0, 0))
return 0;
return 1;
}
memcpy(p->buf + p->len, o->bp, len);
p->len += len;
o->bp += len;
- o->left -= len;
return 1;
case ODR_ENCODE:
if ((res = ber_enclen(o, p->len, 5, 0)) < 0)