X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_bit.c;h=6b615d5250a73e7563a5afa41fd80d94f6405d21;hp=5addedceb934740a5234b958ce7516de9d1ad6a8;hb=379504a233e3e2cc85bca1e7b6d864f1395aec7c;hpb=8d691989077a0addcbd840d769dce6700f3d9622 diff --git a/src/odr_bit.c b/src/odr_bit.c index 5addedc..6b615d5 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) 1995-2009 Index Data * See the file LICENSE for details. - * - * $Id: odr_bit.c,v 1.6 2007-01-03 08:42:15 adam Exp $ */ /** @@ -27,12 +25,13 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name) if (o->error) return 0; - if (o->t_class < 0) + if (o->op->t_class < 0) { - o->t_class = ODR_UNIVERSAL; - o->t_tag = ODR_BITSTRING; + o->op->t_class = ODR_UNIVERSAL; + o->op->t_tag = ODR_BITSTRING; } - if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0) + res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name); + if (res < 0) return 0; if (!res) return odr_missing(o, opt, name); @@ -60,6 +59,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