More in the way of error-checking.

[yaz-moved-to-github.git] / odr / odr_oct.c

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index 7ff12e1..1140648 100644 (file)
--- 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);