Moved more members of public struct odr (ODR*) to struct Odr_private.

[yaz-moved-to-github.git] / src / odr_enum.c

diff --git a/src/odr_enum.c b/src/odr_enum.c
index 214cdb3..d994c70 100644 (file)
--- a/src/odr_enum.c
+++ b/src/odr_enum.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: odr_enum.c,v 1.6 2007-01-03 08:42:15 adam Exp $
+ * $Id: odr_enum.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_enum.c
@@ -24,12 +24,13 @@ int odr_enum(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_ENUM;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_ENUM;
     }
-    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);