X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=63f203c97a53999a89c97b776ab0f8ce8e78171d;hb=0dcf720d5b83783f6dba31f44b12513cefdd2f75;hp=4daccb3e451dcf56db9c64c5a8a07b083a4ccc3e;hpb=173d9f50b7a6c63dff6c74dc5c3efe985f75ef39;p=yaz-moved-to-github.git

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index 4daccb3..63f203c 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.2  1995-02-02 20:38:51  quinn
+ * Revision 1.4  1995-02-07 14:13:46  quinn
+ * Bug fixes.
+ *
+ * Revision 1.3  1995/02/03  17:04:38  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.2  1995/02/02  20:38:51  quinn
  * Updates.
  *
  * Revision 1.1  1995/02/02  16:21:54  quinn
@@ -18,7 +24,7 @@
  * 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)
 {
     int res, cons = 0;
 
@@ -28,7 +34,10 @@ int odr_octetstring(ODR o, ODR_OCT **p, int opt)
     	o->t_tag = ODR_OCTETSTRING;
     }
     if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+    {
+    	*p = 0;
     	return 0;
+    }
     if (!res)
     {
     	*p = 0;
@@ -39,9 +48,9 @@ int odr_octetstring(ODR o, ODR_OCT **p, int opt)
     	fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
     	return 1;
     }
-    if (o->direction == ODR_DECODE && !*p)
+    if (o->direction == ODR_DECODE)
     {
-    	*p = nalloc(o, sizeof(ODR_OCT));
+    	*p = nalloc(o, sizeof(Odr_oct));
     	(*p)->size= 0;
     	(*p)->len = 0;
     	(*p)->buf = 0;
@@ -52,15 +61,15 @@ int odr_octetstring(ODR o, ODR_OCT **p, int opt)
 /*
  * Friendlier interface to octetstring.
  */
-int odr_visiblestring(ODR o, char **p, int opt)
+int odr_cstring(ODR o, char **p, int opt)
 {
     int cons = 0, res;
-    ODR_OCT *t;
+    Odr_oct *t;
 
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
-    	o->t_tag = ODR_VISIBLESTRING;
+    	o->t_tag = ODR_OCTETSTRING;
     }
     if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
     	return 0;
@@ -74,7 +83,7 @@ int odr_visiblestring(ODR o, char **p, int opt)
     	fprintf(o->print, "'%s'\n", *p);
     	return 1;
     }
-    t = nalloc(o, sizeof(ODR_OCT));   /* wrapper for octstring */
+    t = nalloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
     	t->buf = (unsigned char *) *p;