X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bool.c;h=597293c4cedf786907fc641828b0c70e1a646aa2;hb=b08d68a3edac5a93dce61f98d2f030ea722311c4;hp=7a09f96bdf6f48c78e9150ef6a171cb3d79722ae;hpb=6d0cb38e2fd32c722b0af63ce050ac5c458d849f;p=yaz-moved-to-github.git

diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index 7a09f96..597293c 100644
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -1,48 +1,45 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bool.c,v $
- * 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.
- *
+ * $Id: odr_bool.c,v 1.13 2002-07-25 12:51:08 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
-#include <odr.h>
+#include "odr-priv.h"
 
 /*
  * Top level boolean en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_bool(ODR o, int **p, int opt)
+int odr_bool(ODR o, int **p, int opt, const char *name)
 {
     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)
     	return opt;
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%s%s\n", odr_indent(o), (**p ? "TRUE" : "FALSE"));
+	odr_prname(o, name);
+    	fprintf(o->print, "%s\n", (**p ? "TRUE" : "FALSE"));
     	return 1;
     }
     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);
 }