Happy new year

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

diff --git a/src/odr_bool.c b/src/odr_bool.c
index 6a77716..62354cb 100644 (file)
--- a/src/odr_bool.c
+++ b/src/odr_bool.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data

  * See the file LICENSE for details.
  * See the file LICENSE for details.

- *
- * $Id: odr_bool.c,v 1.6 2007-01-03 08:42:15 adam Exp $

  */
 
 /**
  */
 
 /**

@@ -20,18 +18,19 @@
  * Top level boolean en/decoder.
  * Returns 1 on success, 0 on error.
  */
  * Top level boolean en/decoder.
  * Returns 1 on success, 0 on error.
  */

-int odr_bool(ODR o, int **p, int opt, const char *name)
+int odr_bool(ODR o, Odr_bool **p, int opt, const char *name)

 {
     int res, cons = 0;
 
     if (o->error)
         return 0;
 {
     int res, cons = 0;
 
     if (o->error)
         return 0;

-    if (o->t_class < 0)
+    if (o->op->t_class < 0)

     {
     {

-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_BOOLEAN;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_BOOLEAN;

     }
     }

-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)

         return 0;
     if (!res)
         return odr_missing(o, opt, name);
         return 0;
     if (!res)
         return odr_missing(o, opt, name);

@@ -50,6 +49,7 @@ int odr_bool(ODR o, int **p, int opt, const char *name)
 /*
  * Local variables:
  * c-basic-offset: 4
 /*
  * Local variables:
  * c-basic-offset: 4

+ * c-file-style: "Stroustrup"

  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab