X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bit.c;h=666d32919f38ad3f7c1993ec89af176ab719d6d2;hb=695e6df9fce9b838cb3fe8f49b211ed99943caef;hp=3ab4ed0a2aa4d209fb0b4b0839d00775c3b83e41;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git diff --git a/odr/ber_bit.c b/odr/ber_bit.c index 3ab4ed0..666d329 100644 --- a/odr/ber_bit.c +++ b/odr/ber_bit.c @@ -1,10 +1,18 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_bit.c,v $ - * Revision 1.10 1999-11-30 13:47:11 adam + * Revision 1.12 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.11 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.10 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.9 1999/04/20 09:56:48 adam @@ -38,6 +46,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include @@ -55,7 +66,6 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons) return 0; } o->bp += res; - o->left -= res; if (cons) /* fetch component strings */ { base = o->bp; @@ -78,12 +88,10 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons) return 0; } o->bp++; /* silently ignore the unused-bits field */ - o->left--; len--; memcpy(p->bits + p->top + 1, o->bp, len); p->top += len; o->bp += len; - o->left -= len; return 1; case ODR_ENCODE: if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)