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

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 06047be..129a272 100644
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -1,22 +1,78 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, 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
+ * 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.
  *
  */
 
 #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 = odr_malloc(o, size);
+    else if (!*pp)
+    {
+	o->t_class = -1;
+	return 0;
+    }
+    return 1;
+}