X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_bit.c;h=6600e43163bb44c80206bc2f48f526f759a9070c;hp=2622281e5d9ebb7b31ef6310fef7f8538bd43667;hb=7fc72f3ae149e416a297ef1f55c09271056e98f1;hpb=db93359f0cbf9a1e9dc81ea05f7b8662f843ae3d diff --git a/src/odr_bit.c b/src/odr_bit.c index 2622281..6600e43 100644 --- a/src/odr_bit.c +++ b/src/odr_bit.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) Index Data * See the file LICENSE for details. - * - * $Id: odr_bit.c,v 1.7 2007-03-19 21:08:13 adam Exp $ */ /** @@ -39,8 +37,20 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name) return odr_missing(o, opt, name); if (o->direction == ODR_PRINT) { + int i = ODR_BITMASK_SIZE; + int j; odr_prname(o, name); - odr_printf(o, "BITSTRING(len=%d)\n",(*p)->top + 1); + odr_printf(o, "BITSTRING(len=%d) ",(*p)->top + 1); + while (--i > 0) + if (ODR_MASK_GET(*p, i)) + break; + for (j = 0; j <= i; j++) + { + odr_printf(o, "%c", ODR_MASK_GET(*p, j) ? '1' : '0'); + if (j && ((j+1)&7) == 0) + odr_printf(o, "-"); + } + odr_printf(o, "\n"); return 1; } if (o->direction == ODR_DECODE) @@ -50,7 +60,7 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name) (*p)->top = -1; } #if 0 - /* ignoring the cons helps with at least one target. + /* ignoring the cons helps with at least one target. * http://bugzilla.indexdata.dk/cgi-bin/bugzilla/show_bug.cgi?id=24 */ return ber_bitstring(o, *p, 0); @@ -61,6 +71,7 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab