X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bool.c;h=5279ae240a26f3929706926615212b12b4c64324;hb=b200b3ce30a8db1d68b2ddfe9994acff1a5d2789;hp=bc21834d92b4efc5bdf9cec0d1909bf6ba6ef0eb;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index bc21834..5279ae2 100644
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bool.c,v $
- * Revision 1.2  1995-02-09 15:51:47  quinn
+ * Revision 1.5  1995-03-17 10:17:49  quinn
+ * Added memory management.
+ *
+ * Revision 1.4  1995/03/08  12:12:20  quinn
+ * Added better error checking.
+ *
+ * Revision 1.3  1995/02/10  18:57:25  quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.2  1995/02/09  15:51:47  quinn
  * Works better now.
  *
  * Revision 1.1  1995/02/02  16:21:53  quinn
@@ -23,20 +32,17 @@ int odr_bool(ODR o, int **p, int opt)
 {
     int res, cons = 0;
 
+    if (o->error)
+    	return 0;
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_BOOLEAN;
     }
-    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, opt)) < 0)
     	return 0;
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
     	fprintf(o->print, "%s%s\n", odr_indent(o), (**p ? "TRUE" : "FALSE"));
@@ -45,6 +51,6 @@ int odr_bool(ODR o, int **p, int opt)
     if (cons)
     	return 0;
     if (o->direction == ODR_DECODE)
-    	*p = nalloc(o, sizeof(int));
+    	*p = odr_malloc(o, sizeof(int));
     return ber_boolean(o, *p);
 }