X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bool.c;h=597293c4cedf786907fc641828b0c70e1a646aa2;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=b5ea387e6c5adf36bb655eb21348080d38431f8b;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index b5ea387..597293c 100644
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -1,40 +1,22 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bool.c,v $
- * 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.
- *
+ * $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 MDF odr_bool(ODR o, int **p, int opt)
+int odr_bool(ODR o, int **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -51,12 +33,13 @@ int MDF odr_bool(ODR o, int **p, int opt)
     	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 = odr_malloc(o, sizeof(int));
+    	*p = (int *)odr_malloc(o, sizeof(int));
     return ber_boolean(o, *p);
 }