X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_oct.c;h=5598e4cc791b02d32c209465f058bd862dbc0baa;hp=63f203c97a53999a89c97b776ab0f8ce8e78171d;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=b40d7c8dfa49bf5e6800688e1dfb1373856796a8

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index 63f203c..5598e4c 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -1,10 +1,38 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-1999, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.4  1995-02-07 14:13:46  quinn
+ * Revision 1.13  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.12  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.11  1995/09/29 17:12:25  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/27  15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/05/16  08:50:56  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.8  1995/03/17  10:17:54  quinn
+ * Added memory management.
+ *
+ * Revision 1.7  1995/03/08  12:12:27  quinn
+ * Added better error checking.
+ *
+ * Revision 1.6  1995/02/10  18:57:26  quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.5  1995/02/09  15:51:49  quinn
+ * Works better now.
+ *
+ * Revision 1.4  1995/02/07  14:13:46  quinn
  * Bug fixes.
  *
  * Revision 1.3  1995/02/03  17:04:38  quinn
@@ -24,66 +52,66 @@
  * Top level octet string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_octetstring(ODR o, Odr_oct **p, int opt)
+int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
 {
     int res, cons = 0;
 
+    if (o->error)
+    	return 0;
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
-    {
-    	*p = 0;
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
     	return 0;
-    }
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
+	odr_prname(o, name);
     	fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
     	return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-    	*p = nalloc(o, sizeof(Odr_oct));
+    	*p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
     	(*p)->size= 0;
     	(*p)->len = 0;
     	(*p)->buf = 0;
     }
-    return ber_octetstring(o, *p, cons);
+    if (ber_octetstring(o, *p, cons))
+    	return 1;
+    o->error = OOTHER;
+    return 0;
 }
 
 /*
  * Friendlier interface to octetstring.
  */
-int odr_cstring(ODR o, char **p, int opt)
+int odr_cstring(ODR o, char **p, int opt, const char *name)
 {
     int cons = 0, res;
     Odr_oct *t;
 
+    if (o->error)
+    	return 0;
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
     	return 0;
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
+    	odr_prname(o, name);
     	fprintf(o->print, "'%s'\n", *p);
     	return 1;
     }
-    t = nalloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
+    t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
     	t->buf = (unsigned char *) *p;