X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_enum.c;h=22c20d8fd86fe1177f627413c8830fc7014a4d41;hb=759184a854d23a99ca8ac0d401d5e3886cfde45b;hp=b60014bb8a05e9bb7ae34420838a3478f3ecb557;hpb=569f86b4615c2731727be2a0ff898d36f9725819;p=yaz-moved-to-github.git diff --git a/odr/odr_enum.c b/odr/odr_enum.c index b60014b..22c20d8 100644 --- a/odr/odr_enum.c +++ b/odr/odr_enum.c @@ -1,9 +1,9 @@ /* - * Copyright (c) 1995-2002, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: odr_enum.c,v 1.6 2002-07-25 12:51:08 adam Exp $ + * $Id: odr_enum.c,v 1.9 2003-05-20 19:55:30 adam Exp $ */ #if HAVE_CONFIG_H #include @@ -26,10 +26,10 @@ int odr_enum(ODR o, int **p, int opt, const char *name) o->t_class = ODR_UNIVERSAL; o->t_tag = ODR_ENUM; } - if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0) + if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0) return 0; if (!res) - return opt; + return odr_missing(o, opt, name); if (o->direction == ODR_PRINT) { odr_prname(o, name); @@ -38,7 +38,7 @@ int odr_enum(ODR o, int **p, int opt, const char *name) } if (cons) { - o->error = OPROTO; + odr_seterror(o, OPROTO, 54); return 0; } if (o->direction == ODR_DECODE)