X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bool.c;h=d82ab470af2d404de6a4ca6b2e580da71963fb26;hb=9a13337111b32d256182a4248f93ebe26e393059;hp=d7f749e847d7a7a88dda06d5f0e3f46019595c55;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;p=yaz-moved-to-github.git

diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index d7f749e..d82ab47 100644
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -1,10 +1,37 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2000, 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
+ * Revision 1.11  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10  2000/01/31 13:15:21  adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.9  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.8  1995/09/29 17:12:16  quinn
+ * Smallish
+ *
+ * Revision 1.7  1995/09/27  15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/16  08:50:43  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/04/18  08:15:14  quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.4  1995/03/21  10:17:27  quinn
+ * Fixed little bug in decoder.
+ *
+ * Revision 1.3  1995/03/08  12:12:06  quinn
  * Added better error checking.
  *
  * Revision 1.2  1995/02/09  15:51:45  quinn
@@ -15,38 +42,30 @@
  *
  */
 
-#include <stdio.h>
-#include <odr.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <stdio.h>
+#include <yaz/odr.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;
+	    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
-	    o->left--;
 	    return 1;
 	case ODR_DECODE:
-	    if ((res = ber_declen(b, &len)) < 0)
+	    if ((res = ber_declen(o->bp, &len)) < 0)
 	    {
 	    	o->error = OPROTO;
 		return 0;
@@ -57,10 +76,8 @@ int ber_boolean(ODR o, int *val)
 		return 0;
 	    }
 	    o->bp+= res;
-	    o->left -= res;
-	    *val = *b;
+	    *val = *o->bp;
 	    o->bp++;
-	    o->left--;
 #ifdef ODR_DEBUG
 	    fprintf(stderr, "[val=%d]\n", *val);
 #endif