X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_tag.c;h=8e402137fb1f5b0c10d535c4fb8089363585ee56;hb=cf06b3dea55efd44a2568ac52a089a4c935743bb;hp=06047bef62c2f492831597818d301ebdc06ff0f5;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 06047be..8e40213 100644
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -1,22 +1,57 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_tag.c,v $
- * Revision 1.1  1995-02-02 16:21:54  quinn
- * First kick.
- *
+ * $Id: odr_tag.c,v 1.14 2003-03-11 11:03:31 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "odr-priv.h"
 
-#include <odr.h>
+int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
+{
+    if (o->direction != ODR_DECODE)
+    {
+        odr_seterror(o, OOTHER, 48);
+	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)
+    {
+        odr_seterror(o, OREQUIRED, 49);
+	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;
 }
+
+int odr_initmember(ODR o, void *p, int size)
+{
+    char **pp = (char **) p;
+
+    if (o->error)
+	return 0;
+    if (o->direction == ODR_DECODE)
+	*pp = (char *)odr_malloc(o, size);
+    else if (!*pp)
+    {
+	o->t_class = -1;
+	return 0;
+    }
+    return 1;
+}