X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_enum.c;h=22c20d8fd86fe1177f627413c8830fc7014a4d41;hb=29a22396d7d7b1219f5b83c35983c8fb1cd79e8f;hp=8dc6e8467f8ed99dea2b19d1ebda98a051f73a57;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git diff --git a/odr/odr_enum.c b/odr/odr_enum.c index 8dc6e84..22c20d8 100644 --- a/odr/odr_enum.c +++ b/odr/odr_enum.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: odr_enum.c,v 1.7 2003-01-06 08:20:27 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)