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 20e10d9..d994c70 100644 (file)
--- a/src/odr_enum.c
+++ b/src/odr_enum.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: odr_enum.c,v 1.4 2005-01-15 19:47:14 adam Exp $
+ * $Id: odr_enum.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_enum.c
@@ -24,18 +24,19 @@ 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);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
+        odr_prname(o, name);
         odr_printf(o, "%d\n", **p);
         return 1;
     }
@@ -48,3 +49,11 @@ int odr_enum(ODR o, int **p, int opt, const char *name)
         *p = (int *)odr_malloc(o, sizeof(int));
     return ber_integer(o, *p);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+