X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_tag.c;h=f4bcd3d4dc8cabc54df6f25b016dc79bfb43ae65;hp=c0c569de17077909401962cf46ba19d726263757;hb=dd016baf50d8cd02a1a32d1fd10b5544cae6ff96;hpb=4c176312acdc3444c9afc820f76a393e64668e52

diff --git a/src/odr_tag.c b/src/odr_tag.c
index c0c569d..f4bcd3d 100644
--- a/src/odr_tag.c
+++ b/src/odr_tag.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_tag.c,v 1.3 2005-01-15 19:47:14 adam Exp $
  */
 /**
  * \file odr_tag.c
@@ -19,14 +17,14 @@ int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
     if (o->direction != ODR_DECODE)
     {
         odr_seterror(o, OOTHER, 48);
-	return 0;
+        return 0;
     }
-    if (o->op->stackp > -1 && !odr_constructed_more(o))
-	return 0;
-    if (ber_dectag(o->bp, zclass, tag, cons, odr_max(o)) <= 0)
+    if (ODR_STACK_NOT_EMPTY(o) && !odr_constructed_more(o))
+        return 0;
+    if (ber_dectag(o->op->bp, zclass, tag, cons, odr_max(o)) <= 0)
     {
         odr_seterror(o, OREQUIRED, 49);
-	return 0;
+        return 0;
     }
     return 1;
 }
@@ -34,11 +32,11 @@ int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
 int odr_implicit_settag(ODR o, int zclass, int tag)
 {
     if (o->error)
-    	return 0;
-    if (o->t_class < 0)
+        return 0;
+    if (o->op->t_class < 0)
     {
-	o->t_class = zclass;
-	o->t_tag = tag;
+        o->op->t_class = zclass;
+        o->op->t_tag = tag;
     }
     return 1;
 }
@@ -48,13 +46,22 @@ int odr_initmember(ODR o, void *p, int size)
     char **pp = (char **) p;
 
     if (o->error)
-	return 0;
+        return 0;
     if (o->direction == ODR_DECODE)
-	*pp = (char *)odr_malloc(o, size);
+        *pp = (char *)odr_malloc(o, size);
     else if (!*pp)
     {
-	o->t_class = -1;
-	return 0;
+        o->op->t_class = -1;
+        return 0;
     }
     return 1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+