X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_enum.c;h=535e80bbdbad857d30e37b8fd0ae69ea615adefa;hp=214cdb36ae6ea362911d0cf1ef99398d40e1a1b2;hb=1f41a1d415d2ab138050a96020ed39caa0c4e323;hpb=8d691989077a0addcbd840d769dce6700f3d9622 diff --git a/src/odr_enum.c b/src/odr_enum.c index 214cdb3..535e80b 100644 --- a/src/odr_enum.c +++ b/src/odr_enum.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: odr_enum.c,v 1.6 2007-01-03 08:42:15 adam Exp $ */ /** * \file odr_enum.c @@ -24,12 +22,13 @@ int odr_enum(ODR o, int **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_ENUM; + o->op->t_class = ODR_UNIVERSAL; + o->op->t_tag = ODR_ENUM; } - 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);