SRW, CQL, 2003

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

diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index d7f749e..20a8a35 100644 (file)
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -1,72 +1,53 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: ber_bool.c,v $
- * Revision 1.3  1995-03-08 12:12:06  quinn
- * Added better error checking.
- *
- * Revision 1.2  1995/02/09  15:51:45  quinn
- * Works better now.
- *
- * Revision 1.1  1995/02/02  16:21:51  quinn
- * First kick.
- *
+ * $Id: ber_bool.c,v 1.13 2003-01-06 08:20:27 adam Exp $
  */
 
-#include <stdio.h>
-#include <odr.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <stdio.h>
+#include "odr-priv.h"
 
 int ber_boolean(ODR o, int *val)
 {
-    unsigned char *b = o->bp;
     int res, len;
 
     switch (o->direction)
     {
-       case ODR_ENCODE:
-           if (!o->left)
-           {
-               o->error = OSPACE;
-               return 0;
-           }
-           if (ber_enclen(o->bp, 1, 1, 1) != 1)
-           {
-               o->error = OOTHER;
-               return 0;
-           }
-           o->bp++;
-           o->left--;
-           *(o->bp++) = (unsigned char) *val;
+    case ODR_ENCODE:
+        if (ber_enclen(o, 1, 1, 1) != 1)
+            return 0;
+        if (odr_putc(o, *val) < 0)
+            return 0;
 #ifdef ODR_DEBUG
-           fprintf(stderr, "[val=%d]\n", *val);
+        fprintf(stderr, "[val=%d]\n", *val);
 #endif
-           o->left--;
-           return 1;
-       case ODR_DECODE:
-           if ((res = ber_declen(b, &len)) < 0)
-           {
-               o->error = OPROTO;
-               return 0;
-           }
-           if (len != 1)
-           {
-               o->error = OPROTO;
-               return 0;
-           }
-           o->bp+= res;
-           o->left -= res;
-           *val = *b;
-           o->bp++;
-           o->left--;
+        return 1;
+    case ODR_DECODE:
+        if ((res = ber_declen(o->bp, &len)) < 0)
+        {
+            o->error = OPROTO;
+            return 0;
+        }
+        if (len != 1)
+        {
+            o->error = OPROTO;
+            return 0;
+        }
+        o->bp+= res;
+        *val = *o->bp;
+        o->bp++;
 #ifdef ODR_DEBUG
-           fprintf(stderr, "[val=%d]\n", *val);
+        fprintf(stderr, "[val=%d]\n", *val);
 #endif
-           return 1;
-       case ODR_PRINT:
-           return 1;
-       default: o->error = OOTHER; return 0;
+        return 1;
+    case ODR_PRINT:
+        return 1;
+    default: o->error = OOTHER; return 0;
     }
 }