X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_tag.c;h=3642f46baf1d75e0a71e8856bf0231629242d7c0;hp=9e3ee323bd4b0b8ab3dde032459d304d8dd8b0b6;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=63cafe41a93427118959a74201b3e331169a71d9

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 9e3ee32..3642f46 100644
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_tag.c,v $
- * Revision 1.5  1995-09-29 17:12:27  quinn
+ * 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
+ * More explain stuff.
+ *
+ * Revision 1.5  1995/09/29  17:12:27  quinn
  * Smallish
  *
  * Revision 1.4  1995/09/27  15:03:00  quinn
@@ -23,14 +35,47 @@
 
 #include <odr.h>
 
-int odr_implicit_settag(ODR o, int class, int tag)
+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))
+	return 0;
+    if (ber_dectag(o->bp, zclass, tag, cons) <= 0)
+    {
+	o->error = OREQUIRED;
+	return 0;
+    }
+    return 1;
+}
+
+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;
+}