X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_tag.c;h=288403b1e839d4a5a6ccf24e894b7292c0f2817e;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=99486450b1a10352a47f142b7a6828bf483cf1cf;hpb=c830124fd18d0bc1dc330d7d8b62aac51d12659c;p=yaz-moved-to-github.git

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 9948645..288403b 100644
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -1,44 +1,26 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2002, 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
- * 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.12 2002-07-25 12:51:08 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.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)
     {
 	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, class, tag, cons) <= 0)
+    if (ber_dectag(o->bp, zclass, tag, cons) <= 0)
     {
 	o->error = OREQUIRED;
 	return 0;
@@ -46,13 +28,13 @@ int odr_peektag(ODR o, int *class, int *tag, int *cons)
     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;
@@ -65,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;