X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_int.c;h=57e7847740d48c14d34ba44b2c2554bea45e8983;hp=37c08d65b9c4262b7419a3292ec58e22942bedcc;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4

diff --git a/odr/odr_int.c b/odr/odr_int.c
index 37c08d6..57e7847 100644
--- a/odr/odr_int.c
+++ b/odr/odr_int.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_int.c,v $
- * Revision 1.8  1995-09-27 15:02:59  quinn
+ * Revision 1.13  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.12  1999/01/08 11:23:28  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.11  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10  1995/09/29 17:12:24  quinn
+ * Smallish
+ *
+ * Revision 1.9  1995/09/29  17:01:50  quinn
+ * More Windows work
+ *
+ * Revision 1.8  1995/09/27  15:02:59  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.7  1995/05/16  08:50:54  quinn
@@ -36,32 +52,33 @@
  * Top level integer en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int MDF 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;
+        return 0;
     if (o->t_class < 0)
     {
-    	o->t_class = ODR_UNIVERSAL;
-    	o->t_tag = ODR_INTEGER;
+        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;
+        return 0;
     if (!res)
-    	return opt;
+        return opt;
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%s%d\n", odr_indent(o), **p);
-    	return 1;
+	odr_prname(o, name);
+        fprintf(o->print, "%d\n", **p);
+        return 1;
     }
     if (cons)
     {
-    	o->error = OPROTO;
-    	return 0;
+        o->error = OPROTO;
+        return 0;
     }
     if (o->direction == ODR_DECODE)
-    	*p = odr_malloc(o, sizeof(int));
+        *p = (int *)odr_malloc(o, sizeof(int));
     return ber_integer(o, *p);
 }