From: Adam Dickmeiss Date: Tue, 20 May 2003 19:50:12 +0000 (+0000) Subject: Indentation X-Git-Tag: YAZ.2.0.2.RH.2~14 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=05d1794c4ac57eabe6f6da766156f6986d5c987c;p=yaz-moved-to-github.git Indentation --- diff --git a/odr/ber_bit.c b/odr/ber_bit.c index 33ce6b1..d82e116 100644 --- a/odr/ber_bit.c +++ b/odr/ber_bit.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: ber_bit.c,v 1.15 2003-03-11 11:03:31 adam Exp $ + * $Id: ber_bit.c,v 1.16 2003-05-20 19:50:12 adam Exp $ * */ #if HAVE_CONFIG_H @@ -19,56 +19,59 @@ 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) - { - odr_seterror(o, OPROTO, 4); - return 0; - } - o->bp += res; - if (cons) /* fetch component strings */ - { - base = o->bp; - while (odp_more_chunks(o, base, len)) - if (!odr_bitstring(o, &p, 0, 0)) - return 0; - return 1; - } - /* primitive bitstring */ - if (len < 0) - { - odr_seterror(o, OOTHER, 5); - return 0; - } - if (len == 0) - return 1; - if (len - 1 > ODR_BITMASK_SIZE) - { - odr_seterror(o, OOTHER, 6); - return 0; - } - if (len > odr_max(o)) - { - odr_seterror(o, OOTHER, 7); - return 0; - } - o->bp++; /* silently ignore the unused-bits field */ - len--; - memcpy(p->bits + p->top + 1, o->bp, len); - p->top += len; - o->bp += len; - return 1; - case ODR_ENCODE: - if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0) - return 0; - if (odr_putc(o, 0) < 0) /* no unused bits here */ - return 0; - if (p->top < 0) - return 1; - if (odr_write(o, p->bits, p->top + 1) < 0) - return 0; - return 1; - case ODR_PRINT: return 1; - default: odr_seterror(o, OOTHER, 8); return 0; + case ODR_DECODE: + if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0) + { + odr_seterror(o, OPROTO, 4); + return 0; + } + o->bp += res; + if (cons) /* fetch component strings */ + { + base = o->bp; + while (odp_more_chunks(o, base, len)) + if (!odr_bitstring(o, &p, 0, 0)) + return 0; + return 1; + } + /* primitive bitstring */ + if (len < 0) + { + odr_seterror(o, OOTHER, 5); + return 0; + } + if (len == 0) + return 1; + if (len - 1 > ODR_BITMASK_SIZE) + { + odr_seterror(o, OOTHER, 6); + return 0; + } + if (len > odr_max(o)) + { + odr_seterror(o, OOTHER, 7); + return 0; + } + o->bp++; /* silently ignore the unused-bits field */ + len--; + memcpy(p->bits + p->top + 1, o->bp, len); + p->top += len; + o->bp += len; + return 1; + case ODR_ENCODE: + if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0) + return 0; + if (odr_putc(o, 0) < 0) /* no unused bits here */ + return 0; + if (p->top < 0) + return 1; + if (odr_write(o, p->bits, p->top + 1) < 0) + return 0; + return 1; + case ODR_PRINT: + return 1; + default: + odr_seterror(o, OOTHER, 8); + return 0; } }