X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_bit.c;h=becc680ea7eb08cd645dbe201282ab1494d451de;hp=e202e1f64ffc31ddb833994f445dc9df6622f7b7;hb=473824797f568578dc17d7242551cb2f7ccef46c;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7

diff --git a/src/ber_bit.c b/src/ber_bit.c
index e202e1f..becc680 100644
--- a/src/ber_bit.c
+++ b/src/ber_bit.c
@@ -1,9 +1,9 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
-/** 
+/**
  * \file ber_bit.c
  * \brief Implements BER BITSTRING encoding and decoding.
  *
@@ -20,20 +20,20 @@
 int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 {
     int res, len;
-    const unsigned char *base;
+    const char *base;
 
     switch (o->direction)
     {
     case ODR_DECODE:
-        if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
+        if ((res = ber_declen(o->op->bp, &len, odr_max(o))) < 0)
         {
             odr_seterror(o, OPROTO, 4);
             return 0;
         }
-        o->bp += res;
+        o->op->bp += res;
         if (cons)       /* fetch component strings */
         {
-            base = o->bp;
+            base = o->op->bp;
             while (odp_more_chunks(o, base, len))
                 if (!odr_bitstring(o, &p, 0, 0))
                     return 0;
@@ -57,11 +57,11 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
             odr_seterror(o, OOTHER, 7);
             return 0;
         }
-        o->bp++;      /* silently ignore the unused-bits field */
+        o->op->bp++;      /* silently ignore the unused-bits field */
         len--;
-        memcpy(p->bits + p->top + 1, o->bp, len);
+        memcpy(p->bits + p->top + 1, o->op->bp, len);
         p->top += len;
-        o->bp += len;
+        o->op->bp += len;
         return 1;
     case ODR_ENCODE:
         if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
@@ -75,7 +75,7 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
         return 1;
     case ODR_PRINT:
         return 1;
-    default: 
+    default:
         odr_seterror(o, OOTHER, 8);
         return 0;
     }
@@ -83,6 +83,7 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab