X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=odr%2Fodr_enum.c;h=22c20d8fd86fe1177f627413c8830fc7014a4d41;hb=ec1f815d5348cd21e393f76bc212c910c34bbc45;hp=7c4f90060b63405736b32a5e8cda94a25077d088;hpb=21ea17f766bb492a93154ec7b242653fa37dec91;p=yaz-moved-to-github.git

diff --git a/odr/odr_enum.c b/odr/odr_enum.c
index 7c4f900..22c20d8 100644
--- a/odr/odr_enum.c
+++ b/odr/odr_enum.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_enum.c,v $
- * Revision 1.2  1999-01-08 11:23:27  adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.1  1998/03/20 14:45:01  adam
- * Implemented odr_enum and odr_set_of.
- *
+ * $Id: odr_enum.c,v 1.9 2003-05-20 19:55:30 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 /*
  * Top level enum en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_enum(ODR o, int **p, int opt)
+int odr_enum(ODR o, int **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -29,18 +26,19 @@ int odr_enum(ODR o, int **p, int opt)
         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)
     {
-        fprintf(o->print, "%s%d\n", odr_indent(o), **p);
+	odr_prname(o, name);
+        fprintf(o->print, "%d\n", **p);
         return 1;
     }
     if (cons)
     {
-        o->error = OPROTO;
+        odr_seterror(o, OPROTO, 54);
         return 0;
     }
     if (o->direction == ODR_DECODE)