SRW, CQL, 2003

[yaz-moved-to-github.git] / odr / odr_tag.c

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 129a272..6fa0eb4 100644 (file)
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -1,36 +1,15 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_tag.c,v $
- * 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
- * More explain stuff.
- *
- * Revision 1.5  1995/09/29  17:12:27  quinn
- * Smallish
- *
- * Revision 1.4  1995/09/27  15:03:00  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.3  1995/05/16  08:51:00  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.2  1995/03/08  12:12:31  quinn
- * Added better error checking.
- *
- * Revision 1.1  1995/02/02  16:21:54  quinn
- * First kick.
- *
+ * $Id: odr_tag.c,v 1.13 2003-01-06 08:20:28 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
 {
@@ -39,7 +18,7 @@ int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
        o->error = OOTHER;
        return 0;
     }
-    if (o->stackp > -1 && !odr_constructed_more(o))
+    if (o->op->stackp > -1 && !odr_constructed_more(o))
        return 0;
     if (ber_dectag(o->bp, zclass, tag, cons) <= 0)
     {
@@ -68,7 +47,7 @@ int odr_initmember(ODR o, void *p, int size)
     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;