X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fber_bool.c;h=7ce8dc266d6d80ebfae036d7716dfc8de03c6602;hp=f50fdb693127ca779e7794aaf509809a15acf44f;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70

diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index f50fdb6..7ce8dc2 100644
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -1,48 +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.1  1995-02-02 16:21:51  quinn
- * First kick.
- *
+ * $Id: ber_bool.c,v 1.14 2003-03-11 11:03:31 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 (ber_enclen(o->bp, 1, 1, 1) != 1)
-		return 0;
-	    o->bp++;
-	    o->left--;
-	    *(o->bp++) = (unsigned char) *val;
-	    fprintf(stderr, "[val=%d]\n", *val);
-	    o->left--;
-	    return 1;
-	case ODR_DECODE:
-	    if ((res = ber_declen(b, &len)) < 0)
-		return 0;
-	    if (len != 1)
-		return 0;
-	    o->bp+= res;
-	    o->left -= res;
-	    *val = *b;
-	    o->bp++;
-	    o->left--;
-	    fprintf(stderr, "[val=%d]\n", *val);
-	    return 1;
-	case ODR_PRINT:
-	    return 1;
-	default: return 0;
+    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);
+#endif
+        return 1;
+    case ODR_DECODE:
+        if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
+        {
+            odr_seterror(o, OPROTO, 9);
+            return 0;
+        }
+        o->bp+= res;
+        if (len != 1 || odr_max(o) < len)
+        {
+            odr_seterror(o, OPROTO, 10);
+            return 0;
+        }
+        *val = *o->bp;
+        o->bp++;
+#ifdef ODR_DEBUG
+        fprintf(stderr, "[val=%d]\n", *val);
+#endif
+        return 1;
+    case ODR_PRINT:
+        return 1;
+    default: odr_seterror(o, OOTHER, 11); return 0;
     }
 }