X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=1140648365d2e21554fceb63280a02235fe0d0d8;hb=fb2db0abc51ed82583dc4600fd4ff035c96f7d79;hp=7ff12e1824116b4b51ca8b46378e324ccb329359;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index 7ff12e1..1140648 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.5  1995-02-09 15:51:49  quinn
+ * 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
@@ -36,18 +39,10 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt)
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_OCTETSTRING;
     }
-    if (o->direction == ODR_DECODE)
-    	*p = 0;
-    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)) < 0)
     	return 0;
-    }
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
     	fprintf(o->print, "%sOCTETSTRING(len=%d)\n", odr_indent(o), (*p)->len);
@@ -79,15 +74,10 @@ int odr_cstring(ODR o, char **p, int opt)
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_OCTETSTRING;
     }
-    if (o->direction == ODR_DECODE)
-    	*p = 0;
-    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)) < 0)
     	return 0;
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
     	fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);