X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bit.c;h=25edfa0dcc7f8184be1b5766c0aec1c61755c565;hb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;hp=8d080a2d99119e6ef228f219c33ed0a1ce6de78e;hpb=32226b4f15d634d5e48b1306aeeb26a370c8f5c5;p=yaz-moved-to-github.git diff --git a/odr/odr_bit.c b/odr/odr_bit.c index 8d080a2..25edfa0 100644 --- a/odr/odr_bit.c +++ b/odr/odr_bit.c @@ -4,7 +4,19 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_bit.c,v $ - * Revision 1.2 1995-02-03 17:04:37 quinn + * Revision 1.6 1995-03-08 12:12:19 quinn + * Added better error checking. + * + * Revision 1.5 1995/02/10 18:57:25 quinn + * More in the way of error-checking. + * + * Revision 1.4 1995/02/09 15:51:47 quinn + * Works better now. + * + * Revision 1.3 1995/02/07 14:13:45 quinn + * Bug fixes. + * + * Revision 1.2 1995/02/03 17:04:37 quinn * *** empty log message *** * * Revision 1.1 1995/02/02 20:38:50 quinn @@ -24,24 +36,24 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt) { int res, cons = 0; + if (o->error) + return 0; if (o->t_class < 0) { o->t_class = ODR_UNIVERSAL; o->t_tag = ODR_BITSTRING; } - if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0) + if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0) return 0; if (!res) - { - *p = 0; return opt; - } if (o->direction == ODR_PRINT) { - fprintf(o->print, "BITSTRING(len=%d)\n", (*p)->top + 1); + fprintf(o->print, "%sBITSTRING(len=%d)\n", odr_indent(o), + (*p)->top + 1); return 1; } - if (o->direction == ODR_DECODE && !*p) + if (o->direction == ODR_DECODE) { *p = nalloc(o, sizeof(Odr_bitmask)); memset((*p)->bits, 0, ODR_BITMASK_SIZE);