X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_bool.c;h=f26ac2dc45ba70176f961e363e3c4ea916492b1d;hp=e16bf520a66940009a9c2ab687455290a99e3a8c;hb=6a39772ad0cbd1bcb5d0984cd783d4a9e06bdfdb;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70

diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index e16bf52..f26ac2d 100644
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -1,10 +1,34 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bool.c,v $
- * Revision 1.1  1995-02-02 16:21:53  quinn
+ * Revision 1.9  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8  1995/09/29 17:12:23  quinn
+ * Smallish
+ *
+ * Revision 1.7  1995/09/27  15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/16  08:50:52  quinn
+ * License, documentation, and memory fixes
+ *
+ * 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
  * First kick.
  *
  */
@@ -20,18 +44,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 ((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"));
@@ -40,6 +63,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 = (int *)odr_malloc(o, sizeof(int));
     return ber_boolean(o, *p);
 }