X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_tag.c;h=19459c7d7397b246317db1b54b923f2fe7cd93f9;hb=9a13337111b32d256182a4248f93ebe26e393059;hp=5679838ed5950370ae0598eabc5f52b38781405e;hpb=b2d4fae21009b1909a35ef9ae6bcd27c1a5dca74;p=yaz-moved-to-github.git

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 5679838..19459c7 100644
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_tag.c,v $
- * Revision 1.6  1995-12-14 16:28:26  quinn
+ * Revision 1.11  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * 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
@@ -23,16 +38,36 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <yaz/odr.h>
 
-#include <odr.h>
+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 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;
@@ -45,7 +80,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;