/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_tag.c,v $
- * Revision 1.7 1996-02-20 12:52:54 quinn
+ * Revision 1.11 2000-02-29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9 1998/02/11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1997/05/14 06:53:59 adam
+ * C++ support.
+ *
+ * Revision 1.7 1996/02/20 12:52:54 quinn
* Added odr_peektag
*
* Revision 1.6 1995/12/14 16:28:26 quinn
* First kick.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include <yaz/odr.h>
-int odr_peektag(ODR o, int *class, int *tag, int *cons)
+int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
{
if (o->direction != ODR_DECODE)
{
}
if (o->stackp > -1 && !odr_constructed_more(o))
return 0;
- if (ber_dectag(o->bp, class, tag, cons) <= 0)
+ if (ber_dectag(o->bp, zclass, tag, cons) <= 0)
{
o->error = OREQUIRED;
return 0;
return 1;
}
-int odr_implicit_settag(ODR o, int class, int tag)
+int odr_implicit_settag(ODR o, int zclass, int tag)
{
if (o->error)
return 0;
if (o->t_class < 0)
{
- o->t_class = class;
+ o->t_class = zclass;
o->t_tag = tag;
}
return 1;
if (o->error)
return 0;
if (o->direction == ODR_DECODE)
- *pp = odr_malloc(o, size);
+ *pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
o->t_class = -1;