Improved installation. Moved header files to include/yaz.

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

diff --git a/odr/odr_int.c b/odr/odr_int.c
index 2f9308c..334609a 100644 (file)
--- 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.9  1995-09-29 17:01:50  quinn
+ * Revision 1.14  1999-11-30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * 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
@@ -33,14 +49,13 @@
  *
  */
 
-#include <odr.h>
-#include <prt.h>
+#include <yaz/odr.h>
 
 /*
  * 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;
 
@@ -57,7 +72,8 @@ int MDF odr_integer(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)
@@ -66,6 +82,6 @@ int MDF odr_integer(ODR o, int **p, int opt)
         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);
 }