Merge branch 'master' into sru_2_0

[yaz-moved-to-github.git] / src / odr_mem.c

diff --git a/src/odr_mem.c b/src/odr_mem.c
index 2cc6b4a..33e2bfa 100644 (file)
--- a/src/odr_mem.c
+++ b/src/odr_mem.c
@@ -67,9 +67,6 @@ Odr_oct *odr_create_Odr_oct(ODR o, const char *buf, int sz)
     Odr_oct *p = (Odr_oct *) odr_malloc(o, sizeof(Odr_oct));
     p->buf = (char *) odr_malloc(o, sz);
     memcpy(p->buf, buf, sz);
-#if OCT_SIZE
-    p->size = sz;
-#endif
     p->len = sz;
     return p;
 }
@@ -97,7 +94,7 @@ int odr_grow_block(ODR b, int min_bytes)
     return 0;
 }
 
-int odr_write2(ODR o, const char *buf, int bytes)
+int odr_write(ODR o, const char *buf, int bytes)
 {
     if (o->pos + bytes >= o->size && odr_grow_block(o, bytes))
     {