#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+#include <string.h>
#include <memory.h>
#include <fcntl.h>
{
struct memread_t*mr = (struct memread_t*)reader->internal;
- if(mr->length - reader->pos > len) {
- memcpy(data, &mr->data[reader->pos], len);
- reader->pos += len;
- return len;
- } else {
- memcpy(data, &mr->data[reader->pos], mr->length - reader->pos);
- reader->pos += mr->length;
- return mr->length - reader->pos;
+ if(mr->length - reader->pos < len) {
+ len = mr->length - reader->pos;
}
+ memcpy(data, &mr->data[reader->pos], len);
+ reader->pos += len;
+ return len;
}
static void reader_memread_dealloc(reader_t*reader)
{
}
void reader_init_memreader(reader_t*r, void*newdata, int newlength)
{
- struct memread_t*mr = malloc(sizeof(struct memread_t));
- mr->data = newdata;
+ struct memread_t*mr = (struct memread_t*)malloc(sizeof(struct memread_t));
+ mr->data = (unsigned char*)newdata;
mr->length = newlength;
r->read = reader_memread;
r->dealloc = reader_memread_dealloc;
void writer_init_memwriter(writer_t*w, void*data, int len)
{
struct memwrite_t *mr;
- mr = malloc(sizeof(struct memwrite_t));
- mr->data = data;
+ mr = (struct memwrite_t*)malloc(sizeof(struct memwrite_t));
+ mr->data = (unsigned char *)data;
mr->length = len;
memset(w, 0, sizeof(writer_t));
w->write = writer_memwrite_write;
exit(1);
}
if(mw->length - w->pos < len) {
- unsigned char*newmem;
int newlength = mw->length;
while(newlength - w->pos < len) {
newlength += mw->grow;
}
#ifdef NO_REALLOC
- newmem = malloc(newlength);
+ unsigned char*newmem = (unsigned char*)malloc(newlength);
memcpy(newmem, mw->data, mw->length);
free(mw->data);
mw->data = newmem;
#else
- mw->data = realloc(mw->data, newlength);
+ mw->data = (unsigned char*)realloc(mw->data, newlength);
#endif
mw->length = newlength;
}
static void writer_growmemwrite_finish(writer_t*w)
{
struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
- if(mw->data)
- free(mw->data);
- mw->data = 0;
+ if(mw->data) {
+ free(mw->data);mw->data = 0;
+ }
mw->length = 0;
free(w->internal);mw=0;
memset(w, 0, sizeof(writer_t));
}
+void* writer_growmemwrite_memptr(writer_t*w, int*len)
+{
+ struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
+ if(len) {
+ *len = w->pos;
+ }
+ return mw->data;
+}
void* writer_growmemwrite_getmem(writer_t*w)
{
struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
mw->data = 0;
return ret;
}
+void writer_growmemwrite_reset(writer_t*w)
+{
+ struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
+ w->pos = 0;
+ w->bitpos = 0;
+ w->mybyte = 0;
+}
void writer_init_growingmemwriter(writer_t*w, U32 grow)
{
- struct growmemwrite_t *mr;
- mr = malloc(sizeof(struct growmemwrite_t));
- mr->length = 4096;
- mr->data = malloc(mr->length);
- mr->grow = grow;
+ struct growmemwrite_t *mw;
+ mw = (struct growmemwrite_t *)malloc(sizeof(struct growmemwrite_t));
+ mw->length = 4096;
+ mw->data = (unsigned char *)malloc(mw->length);
+ mw->grow = grow;
memset(w, 0, sizeof(writer_t));
w->write = writer_growmemwrite_write;
w->finish = writer_growmemwrite_finish;
- w->internal = (void*)mr;
+ w->internal = (void*)mw;
w->type = WRITER_TYPE_GROWING_MEM;
w->bitpos = 0;
w->mybyte = 0;
}
void writer_init_filewriter(writer_t*w, int handle)
{
- struct filewrite_t *mr = malloc(sizeof(struct filewrite_t));
+ struct filewrite_t *mr = (struct filewrite_t *)malloc(sizeof(struct filewrite_t));
mr->handle = handle;
mr->free_handle = 0;
memset(w, 0, sizeof(writer_t));
if(!len)
return 0;
- z->zs.next_out = data;
+ z->zs.next_out = (Bytef *)data;
z->zs.avail_out = len;
while(1) {
if(!len)
return 0;
- z->zs.next_in = data;
+ z->zs.next_in = (Bytef *)data;
z->zs.avail_in = len;
while(1) {
U8 reader_readU8(reader_t*r)
{
- U8 b;
- r->read(r, &b, 1);
+ U8 b = 0;
+ if(r->read(r, &b, 1)<1) {
+ fprintf(stderr, "bitio.c:reader_readU8: Read over end of memory region\n");
+ }
return b;
}
U16 reader_readU16(reader_t*r)
{
- U8 b1,b2;
- r->read(r, &b1, 1);
- r->read(r, &b2, 1);
+ U8 b1=0,b2=0;
+ if(r->read(r, &b1, 1)<1) {
+ fprintf(stderr, "bitio.c:reader_readU16: Read over end of memory region\n");
+ }
+ if(r->read(r, &b2, 1)<1) {
+ fprintf(stderr, "bitio.c:reader_readU16: Read over end of memory region\n");
+ }
return b1|b2<<8;
}
U32 reader_readU32(reader_t*r)
{
- U8 b1,b2,b3,b4;
- r->read(r, &b1, 1);
- r->read(r, &b2, 1);
- r->read(r, &b3, 1);
- r->read(r, &b4, 1);
+ U8 b1=0,b2=0,b3=0,b4=0;
+ if(r->read(r, &b1, 1)<1)
+ fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
+ if(r->read(r, &b2, 1)<1)
+ fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
+ if(r->read(r, &b3, 1)<1)
+ fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
+ if(r->read(r, &b4, 1)<1)
+ fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
return b1|b2<<8|b3<<16|b4<<24;
}
float reader_readFloat(reader_t*r)
{
- U8 b1,b2,b3,b4;
+ U8 b1=0,b2=0,b3=0,b4=0;
r->read(r, &b1, 1);
r->read(r, &b2, 1);
r->read(r, &b3, 1);
if(!b)
break;
}
- char*string = writer_growmemwrite_getmem(&g);
- writer_growmemwrite_finish(&g);
+ char*string = (char*)writer_growmemwrite_getmem(&g);
+ g.finish(&g);
return string;
}
w->write(w, &b7, 1);
w->write(w, &b8, 1);
}
-
-