X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_bit.c;h=becc680ea7eb08cd645dbe201282ab1494d451de;hp=ac3631abc3a4afeb2b5aa27d89e3f22f297547c3;hb=bfe768e3b0cf959ed9982a7b6ff6dc9e906820f4;hpb=c82db01c9fc0b51254ec6ead5fe3b503ca098ca0 diff --git a/src/ber_bit.c b/src/ber_bit.c index ac3631a..becc680 100644 --- a/src/ber_bit.c +++ b/src/ber_bit.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -25,15 +25,15 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons) 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)