SRW, CQL, 2003

[yaz-moved-to-github.git] / odr / odr_int.c

diff --git a/odr/odr_int.c b/odr/odr_int.c
index ffb41af..04ffbee 100644 (file)
--- a/odr/odr_int.c
+++ b/odr/odr_int.c
@@ -1,50 +1,47 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_int.c,v $
- * Revision 1.2  1995-02-07 14:13:45  quinn
- * Bug fixes.
- *
- * Revision 1.1  1995/02/02  16:21:53  quinn
- * First kick.
- *
+ * $Id: odr_int.c,v 1.17 2003-01-06 08:20:27 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 /*
  * Top level integer en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_integer(ODR o, int **p, int opt)
+int odr_integer(ODR o, int **p, int opt, const char *name)
 {
     int res, cons = 0;
 
+    if (o->error)
+        return 0;
     if (o->t_class < 0)
     {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_INTEGER;
-    }
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
-    {
-       *p = 0;
-       return 0;
+        o->t_class = ODR_UNIVERSAL;
+        o->t_tag = ODR_INTEGER;
     }
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
+        return 0;
     if (!res)
-    {
-       *p = 0;
-       return opt;
-    }
+        return opt;
     if (o->direction == ODR_PRINT)
     {
-       fprintf(o->print, "%d\n", **p);
-       return 1;
+       odr_prname(o, name);
+        fprintf(o->print, "%d\n", **p);
+        return 1;
     }
     if (cons)
-       return 0;
+    {
+        o->error = OPROTO;
+        return 0;
+    }
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(int));
+        *p = (int *)odr_malloc(o, sizeof(int));
     return ber_integer(o, *p);
 }