Fix sample PQF

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

diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index f26ac2d..9ad56a8 100644 (file)
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -1,46 +1,22 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bool.c,v $
- * 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.
- *
+ * $Id: odr_bool.c,v 1.15 2003-05-20 19:55:30 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;
 
@@ -51,13 +27,14 @@ int odr_bool(ODR o, int **p, int opt)
        o->t_class = ODR_UNIVERSAL;
        o->t_tag = ODR_BOOLEAN;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
        return 0;
     if (!res)
-       return opt;
+       return odr_missing(o, opt, name);
     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)