/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_any.c,v $
- * Revision 1.12 1995-09-29 17:12:15 quinn
+ * Revision 1.18 2000-02-29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.17 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.16 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.15 1999/01/08 11:23:20 adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.14 1998/02/11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.13 1997/05/14 06:53:56 adam
+ * C++ support.
+ *
+ * Revision 1.12 1995/09/29 17:12:15 quinn
* Smallish
*
* Revision 1.11 1995/09/27 15:02:54 quinn
* Works better now.
*
*/
-
-#include <odr.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <yaz/odr.h>
int ber_any(ODR o, Odr_any **p)
{
int res;
+ int left = o->size - (o->bp - o->buf);
switch (o->direction)
{
case ODR_DECODE:
- if ((res = completeBER(o->bp, o->left)) <= 0) /* FIX THIS */
+ if ((res = completeBER(o->bp, left)) <= 0) /* FIX THIS */
{
o->error = OPROTO;
return 0;
}
- (*p)->buf = odr_malloc(o, res);
+ (*p)->buf = (unsigned char *)odr_malloc(o, res);
memcpy((*p)->buf, o->bp, res);
(*p)->len = (*p)->size = res;
o->bp += res;
- o->left -= res;
return 1;
case ODR_ENCODE:
if (odr_write(o, (*p)->buf, (*p)->len) < 0)
/*
* Return length of BER-package or 0.
*/
-int completeBER(unsigned char *buf, int len)
+int completeBER(const unsigned char *buf, int len)
{
- int res, ll, class, tag, cons;
- unsigned char *b = buf;
+ int res, ll, zclass, tag, cons;
+ const unsigned char *b = buf;
if (!len)
return 0;
if (!buf[0] && !buf[1])
return 0;
- if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
+ if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
return 0;
if (res > len)
return 0;