X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fodr.h;h=2e1565921eabc78d81bfcaffe13e0981afa1c3a0;hb=546c28ba38f70ca66b6ce522df97645d9d5cefb9;hp=24a5780008eed420b1c0b5d9c11b777e2bd12d1a;hpb=28231d4c83085109d800c6689ae778cc041c51e7;p=yaz-moved-to-github.git

diff --git a/include/odr.h b/include/odr.h
index 24a5780..2e15659 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -24,7 +24,16 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.24  1997-11-24 11:33:56  adam
+ * Revision 1.27  1999-01-08 11:23:17  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.26  1998/03/20 17:29:20  adam
+ * Include of odr_use.h in odr.h. Added prototype for odr_enum.
+ *
+ * Revision 1.25  1998/02/11 11:53:33  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.24  1997/11/24 11:33:56  adam
  * Using function odr_nullval() instead of global ODR_NULLVAL when
  * appropriate.
  *
@@ -231,11 +240,11 @@ typedef int Odr_oid;   /* terminate by -1 */
 
 typedef struct odr_constack
 {
-    unsigned char *base;         /* starting point of data */
+    const unsigned char *base;   /* starting point of data */
     int base_offset;
     int len;                     /* length of data, if known, else -1
                                         (decoding only) */
-    unsigned char *lenb;         /* where to encode length */
+    const unsigned char *lenb;   /* where to encode length */
     int len_offset;
     int lenlen;                  /* length of length-field */
 } odr_constack;
@@ -265,9 +274,9 @@ typedef struct odr
     int direction;       /* the direction of this stream */
 
     int error;           /* current error state (0==OK) */
-    unsigned char *buf;  /* for encoding or decoding */
+    const unsigned char *buf;  /* for encoding or decoding */
     int buflen;          /* size of buffer for encoding, len for decoding */
-    unsigned char *bp;   /* position in buffer */
+    const unsigned char *bp;   /* position in buffer */
     int left;            /* bytes remaining in buffer */
 
     odr_ecblock ecb;     /* memory control block */
@@ -292,7 +301,7 @@ typedef struct odr
     Odr_ber_tag odr_ber_tag;
 } *ODR;
 
-typedef int (*Odr_fun)();
+typedef int (*Odr_fun)(ODR, char **, int);
 
 typedef struct odr_arm
 {
@@ -406,6 +415,7 @@ YAZ_EXPORT Odr_null *odr_nullval(void);
 }
 #endif
 
+#include <odr_use.h>
 #include <prt.h>
 #include <xmalloc.h>