X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_mem.c;h=33e2bfadb28f4832eda27901f63ca440aee8ac6d;hb=80559dbf0a5d6993eef844e6f6198d28ff5a44fa;hp=52d850baf632068b93164e15a9379cab0067a8c2;hpb=cabcc223cd47503763e7c42969e3be30c58276af;p=yaz-moved-to-github.git

diff --git a/src/odr_mem.c b/src/odr_mem.c
index 52d850b..33e2bfa 100644
--- a/src/odr_mem.c
+++ b/src/odr_mem.c
@@ -62,14 +62,11 @@ size_t odr_total(ODR o)
     return nmem_total(o->mem);
 }
 
-Odr_oct *odr_create_Odr_oct(ODR o, const unsigned char *buf, int sz)
+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 = (unsigned char *) odr_malloc(o, sz);
+    p->buf = (char *) odr_malloc(o, sz);
     memcpy(p->buf, buf, sz);
-#if OCT_SIZE
-    p->size = sz;
-#endif
     p->len = sz;
     return p;
 }
@@ -90,15 +87,14 @@ int odr_grow_block(ODR b, int min_bytes)
     if (togrow < min_bytes)
         togrow = min_bytes;
     if (b->size && !(b->buf =
-                     (unsigned char *) xrealloc(b->buf, b->size += togrow)))
+                     (char *) xrealloc(b->buf, b->size += togrow)))
         abort();
-    else if (!b->size && !(b->buf = (unsigned char *)
-                           xmalloc(b->size = togrow)))
+    else if (!b->size && !(b->buf = (char *) xmalloc(b->size = togrow)))
         abort();
     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))
     {
@@ -112,11 +108,6 @@ int odr_write2(ODR o, const char *buf, int bytes)
     return 0;
 }
 
-int odr_write(ODR o, unsigned char *buf, int bytes)
-{
-    return odr_write2(o, (char *) buf, bytes);
-}
-
 int odr_seek(ODR o, int whence, int offset)
 {
     if (whence == ODR_S_CUR)