X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_int.c;h=8c4b158176ea23ace4d251d64d7534244e8c47d8;hb=be821514c869d68186361b5aab6bbfd1aa60e087;hp=b7001d3525ac34bd59f09e69d7acc1183a418a1b;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git diff --git a/src/odr_int.c b/src/odr_int.c index b7001d3..8c4b158 100644 --- a/src/odr_int.c +++ b/src/odr_int.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: odr_int.c,v 1.5 2005-06-25 15:46:04 adam Exp $ + * $Id: odr_int.c,v 1.7 2007-03-19 21:08:13 adam Exp $ */ /** * \file odr_int.c @@ -24,12 +24,13 @@ int odr_integer(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_INTEGER; + o->op->t_class = ODR_UNIVERSAL; + o->op->t_tag = ODR_INTEGER; } - 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);