#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>
}
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;
}
void writer_init_growingmemwriter(writer_t*w, U32 grow)
{
struct growmemwrite_t *mr;
- mr = malloc(sizeof(struct growmemwrite_t));
+ mr = (struct growmemwrite_t *)malloc(sizeof(struct growmemwrite_t));
mr->length = 4096;
- mr->data = malloc(mr->length);
+ mr->data = (unsigned char *)malloc(mr->length);
mr->grow = grow;
memset(w, 0, sizeof(writer_t));
w->write = writer_growmemwrite_write;
}
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) {
if(!b)
break;
}
- char*string = writer_growmemwrite_getmem(&g);
+ char*string = (char*)writer_growmemwrite_getmem(&g);
writer_growmemwrite_finish(&g);
return string;
}
w->write(w, &b7, 1);
w->write(w, &b8, 1);
}
-
-