X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_enum.c;h=0dda8bb96ee36343e26d0f1628eaa50b1e5b6dd0;hb=8bccad6217bd2ba078106a531a9e73e7f3aae4a9;hp=078593dc24d617eedbef3c92626f7ebbd25721ff;hpb=74582047b4f19d220c6722a85f4651dc742f083f;p=yaz-moved-to-github.git

diff --git a/odr/odr_enum.c b/odr/odr_enum.c
index 078593d..0dda8bb 100644
--- a/odr/odr_enum.c
+++ b/odr/odr_enum.c
@@ -1,22 +1,21 @@
 /*
- * Copyright (c) 1995-1998, 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.1  1998-03-20 14:45:01  adam
- * Implemented odr_enum and odr_set_of.
- *
+ * $Id: odr_enum.c,v 1.8 2003-03-11 11:03:31 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <prt.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;
 
@@ -33,12 +32,13 @@ int odr_enum(ODR o, int **p, int opt)
         return opt;
     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)