X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_choice.c;h=a3264d9bbcda6ac2803bd27a46c68fc11bf74bb2;hp=b3744ca08d31dfa3fbf13234c585a3628e8e43fb;hb=6ee0d7c0404834a0a59547c3bd7e2686f838ce37;hpb=db93359f0cbf9a1e9dc81ea05f7b8662f843ae3d diff --git a/src/odr_choice.c b/src/odr_choice.c index b3744ca..a3264d9 100644 --- a/src/odr_choice.c +++ b/src/odr_choice.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. - * - * $Id: odr_choice.c,v 1.8 2007-03-19 21:08:13 adam Exp $ */ /** @@ -58,7 +56,7 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp, { if (o->op->stack_top && !odr_constructed_more(o)) return 0; - if (ber_dectag(o->bp, &cl, &tg, &cn, odr_max(o)) <= 0) + if (ber_dectag(o->op->bp, &cl, &tg, &cn, odr_max(o)) <= 0) return 0; } else if (o->direction != ODR_DECODE) @@ -102,6 +100,7 @@ void odr_choice_enable_bias (ODR o, int mode) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab