X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Fodr.xml;h=45f83266a85ae5b2c93bc41c84576571b2aaa6a5;hb=83a7bb713c01e6c9b3311c6f5356e76a9a9fb92a;hp=c8d5ae6371a1c55c54083ccb9335b99b2eb0a221;hpb=dd4e8781d27c03476fd6dfd2626480c0c5db00d9;p=yaz-moved-to-github.git
diff --git a/doc/odr.xml b/doc/odr.xml
index c8d5ae6..45f8326 100644
--- a/doc/odr.xml
+++ b/doc/odr.xml
@@ -94,7 +94,7 @@
- void *odr_malloc(ODR o, int size);
+ void *odr_malloc(ODR o, size_t size);
@@ -120,7 +120,7 @@
- int odr_total(ODR o);
+ size_t odr_total(ODR o);
@@ -262,7 +262,7 @@
Encoding and decoding functions
- int odr_integer(ODR o, int **p, int optional, const char *name);
+ int odr_integer(ODR o, Odr_int **p, int optional, const char *name);
int z_APDU(ODR o, Z_APDU **p, int optional, const char *name);
@@ -308,10 +308,10 @@
informative operation.
Summary and Synopsis
- #include <odr.h>
+ #include <yaz/odr.h>
ODR odr_createmem(int direction);
@@ -512,19 +513,17 @@ void do_nothing_useful(int value)
void odr_reset(ODR o);
- char *odr_getbuf(ODR o, int *len);
+ char *odr_getbuf(ODR o, int *len, int *size);
- void odr_setbuf(ODR o, char *buf, int len);
+ void odr_setbuf(ODR o, char *buf, int len, int can_grow);
void *odr_malloc(ODR o, int size);
- ODR_MEM odr_extract_mem(ODR o);
-
- void odr_release_mem(ODR_MEM r);
+ NMEM odr_extract_mem(ODR o);
int odr_geterror(ODR o);
- void odr_perror(char *message);
+ void odr_perror(ODR o, const char *message);
extern char *odr_errlist[];
@@ -587,11 +586,11 @@ void do_nothing_useful(int value)
- int odr_integer(ODR o, int **p, int optional, const char *name);
+ int odr_integer(ODR o, Odr_int **p, int optional, const char *name);
- (we don't allow values that can't be contained in a C integer.)
+ The Odr_int is just a simple integer.
@@ -640,7 +639,7 @@ void do_nothing_useful(int value)
BOOLEAN
-int odr_bool(ODR o, bool_t **p, int optional, const char *name);
+int odr_bool(ODR o, Odr_bool **p, int optional, const char *name);
@@ -654,7 +653,7 @@ int odr_bool(ODR o, bool_t **p, int optional, const char *name);
NULL
-int odr_null(ODR o, bool_t **p, int optional, const char *name);
+int odr_null(ODR o, Odr_null **p, int optional, const char *name);
@@ -796,7 +795,7 @@ int odr_explicit_tag(ODR o, Odr_fun fun, int class, int tag,
-int myInt(ODR o, int **p, int optional, const char *name)
+int myInt(ODR o, Odr_int **p, int optional, const char *name)
{
return odr_implicit_tag(o, odr_integer, p,
ODR_CONTEXT, 210, optional, name);
@@ -868,8 +867,8 @@ MySequence ::= SEQUENCE {
typedef struct MySequence
{
- int *intval;
- bool_t *boolval;
+ Odr_int *intval;
+ Odr_bool *boolval;
} MySequence;
int mySequence(ODR o, MySequence **p, int optional, const char *name)
@@ -1072,7 +1071,7 @@ MyArray ::= SEQUENCE OF INTEGER
typedef struct MyArray
{
int num_elements;
- int **elements;
+ Odr_int **elements;
} MyArray;
@@ -1196,9 +1195,9 @@ typedef struct MyChoice
} which;
union
{
- int *untagged;
- int *tagged;
- bool_t *other;
+ Odr_int *untagged;
+ Odr_int *tagged;
+ Odr_bool *other;
} u;
};