#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>
/* ---------------------------- mem reader ------------------------------- */
-struct memread_t
+typedef struct _memread
{
unsigned char*data;
int length;
-};
+} memread_t;
+
static int reader_memread(reader_t*reader, void* data, int len)
{
- struct memread_t*mr = (struct memread_t*)reader->internal;
+ memread_t*mr = (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;
+ memread_t*mr = (memread_t*)malloc(sizeof(memread_t));
+ mr->data = (unsigned char*)newdata;
mr->length = newlength;
r->read = reader_memread;
r->dealloc = reader_memread_dealloc;
/* ---------------------------- mem writer ------------------------------- */
-struct memwrite_t
+typedef struct _memwrite
{
unsigned char*data;
int length;
-};
+} memwrite_t;
static int writer_memwrite_write(writer_t*w, void* data, int len)
{
- struct memwrite_t*mw = (struct memwrite_t*)w->internal;
+ memwrite_t*mw = (memwrite_t*)w->internal;
if(mw->length - w->pos > len) {
memcpy(&mw->data[w->pos], data, len);
w->pos += len;
free(w->internal);
w->internal = 0;
}
+static void dummy_flush(writer_t*w)
+{
+}
void writer_init_memwriter(writer_t*w, void*data, int len)
{
- struct memwrite_t *mr;
- mr = malloc(sizeof(struct memwrite_t));
- mr->data = data;
+ memwrite_t *mr;
+ mr = (memwrite_t*)malloc(sizeof(memwrite_t));
+ mr->data = (unsigned char *)data;
mr->length = len;
memset(w, 0, sizeof(writer_t));
w->write = writer_memwrite_write;
+ w->flush = dummy_flush;
w->finish = writer_memwrite_finish;
w->internal = (void*)mr;
w->type = WRITER_TYPE_MEM;
/* ------------------------- growing mem writer ------------------------------- */
-struct growmemwrite_t
+typedef struct _growmemwrite
{
unsigned char*data;
int length;
U32 grow;
-};
+} growmemwrite_t;
static int writer_growmemwrite_write(writer_t*w, void* data, int len)
{
- struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
+ growmemwrite_t*mw = (growmemwrite_t*)w->internal;
if(!mw->data) {
fprintf(stderr, "Illegal write operation: data already given away");
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;
+ growmemwrite_t*mw = (growmemwrite_t*)w->internal;
+ 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)
+{
+ growmemwrite_t*mw = (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;
+ growmemwrite_t*mw = (growmemwrite_t*)w->internal;
void*ret = mw->data;
/* remove own reference so that neither write() nor finish() can free it.
It's property of the caller now.
mw->data = 0;
return ret;
}
+void writer_growmemwrite_reset(writer_t*w)
+{
+ growmemwrite_t*mw = (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;
+ growmemwrite_t *mw = (growmemwrite_t *)malloc(sizeof(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->flush = dummy_flush;
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;
/* ---------------------------- file writer ------------------------------- */
-struct filewrite_t
+typedef struct _filewrite
{
int handle;
char free_handle;
-};
+} filewrite_t;
static int writer_filewrite_write(writer_t*w, void* data, int len)
{
- struct filewrite_t * fw= (struct filewrite_t*)w->internal;
+ filewrite_t * fw= (filewrite_t*)w->internal;
+ w->pos += len;
return write(fw->handle, data, len);
}
static void writer_filewrite_finish(writer_t*w)
{
- struct filewrite_t *mr = (struct filewrite_t*)w->internal;
+ filewrite_t *mr = (filewrite_t*)w->internal;
if(mr->free_handle)
close(mr->handle);
free(w->internal);
}
void writer_init_filewriter(writer_t*w, int handle)
{
- struct filewrite_t *mr = malloc(sizeof(struct filewrite_t));
+ filewrite_t *mr = (filewrite_t *)malloc(sizeof(filewrite_t));
mr->handle = handle;
mr->free_handle = 0;
memset(w, 0, sizeof(writer_t));
#endif
O_WRONLY|O_CREAT|O_TRUNC, 0644);
writer_init_filewriter(w, fi);
- ((struct filewrite_t*)w->internal)->free_handle = 1;
+ ((filewrite_t*)w->internal)->free_handle = 1;
}
/* ---------------------------- null writer ------------------------------- */
{
memset(w, 0, sizeof(writer_t));
w->write = writer_nullwrite_write;
+ w->flush = dummy_flush;
w->finish = writer_nullwrite_finish;
w->internal = 0;
w->type = WRITER_TYPE_NULL;
}
/* ---------------------------- zlibinflate reader -------------------------- */
-struct zlibinflate_t
+typedef struct _zlibinflate
{
#ifdef HAVE_ZLIB
z_stream zs;
reader_t*input;
unsigned char readbuffer[ZLIB_BUFFER_SIZE];
#endif
-};
+} zlibinflate_t;
#ifdef HAVE_ZLIB
static void zlib_error(int ret, char* msg, z_stream*zs)
static int reader_zlibinflate(reader_t*reader, void* data, int len)
{
#ifdef HAVE_ZLIB
- struct zlibinflate_t*z = (struct zlibinflate_t*)reader->internal;
+ zlibinflate_t*z = (zlibinflate_t*)reader->internal;
int ret;
if(!z) {
return 0;
if(!len)
return 0;
- z->zs.next_out = data;
+ z->zs.next_out = (Bytef *)data;
z->zs.avail_out = len;
while(1) {
static void reader_zlibinflate_dealloc(reader_t*reader)
{
#ifdef HAVE_ZLIB
- struct zlibinflate_t*z = (struct zlibinflate_t*)reader->internal;
+ zlibinflate_t*z = (zlibinflate_t*)reader->internal;
/* test whether read() already did basic deallocation */
if(reader->internal) {
inflateEnd(&z->zs);
void reader_init_zlibinflate(reader_t*r, reader_t*input)
{
#ifdef HAVE_ZLIB
- struct zlibinflate_t*z;
+ zlibinflate_t*z = (zlibinflate_t*)malloc(sizeof(zlibinflate_t));
+ memset(z, 0, sizeof(zlibinflate_t));
int ret;
memset(r, 0, sizeof(reader_t));
- z = (struct zlibinflate_t*)malloc(sizeof(struct zlibinflate_t));
- memset(z, 0, sizeof(struct zlibinflate_t));
r->internal = z;
r->read = reader_zlibinflate;
r->dealloc = reader_zlibinflate_dealloc;
/* ---------------------------- zlibdeflate writer -------------------------- */
-struct zlibdeflate_t
+typedef struct _zlibdeflate
{
#ifdef HAVE_ZLIB
z_stream zs;
writer_t*output;
unsigned char writebuffer[ZLIB_BUFFER_SIZE];
#endif
-};
+} zlibdeflate_t;
static int writer_zlibdeflate_write(writer_t*writer, void* data, int len)
{
#ifdef HAVE_ZLIB
- struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal;
+ zlibdeflate_t*z = (zlibdeflate_t*)writer->internal;
int ret;
if(writer->type != WRITER_TYPE_ZLIB) {
fprintf(stderr, "Wrong writer ID (writer not initialized?)\n");
if(!len)
return 0;
- z->zs.next_in = data;
+ z->zs.next_in = (Bytef *)data;
z->zs.avail_in = len;
while(1) {
if (ret != Z_OK) zlib_error(ret, "bitio:deflate_deflate", &z->zs);
if(z->zs.next_out != z->writebuffer) {
+ writer->pos += z->zs.next_out - (Bytef*)z->writebuffer;
z->output->write(z->output, z->writebuffer, z->zs.next_out - (Bytef*)z->writebuffer);
z->zs.next_out = z->writebuffer;
z->zs.avail_out = ZLIB_BUFFER_SIZE;
break;
}
}
- writer->pos += len;
return len;
#else
fprintf(stderr, "Error: swftools was compiled without zlib support");
exit(1);
#endif
}
+
+void writer_zlibdeflate_flush(writer_t*writer)
+{
+#ifdef HAVE_ZLIB
+ zlibdeflate_t*z = (zlibdeflate_t*)writer->internal;
+ int ret;
+ if(writer->type != WRITER_TYPE_ZLIB) {
+ fprintf(stderr, "Wrong writer ID (writer not initialized?)\n");
+ return;
+ }
+ if(!z) {
+ fprintf(stderr, "zlib not initialized!\n");
+ return;
+ }
+
+ z->zs.next_in = 0;
+ z->zs.avail_in = 0;
+ while(1) {
+ ret = deflate(&z->zs, Z_SYNC_FLUSH);
+ if (ret != Z_OK) zlib_error(ret, "bitio:deflate_flush", &z->zs);
+ if(z->zs.next_out != z->writebuffer) {
+ writer->pos += z->zs.next_out - (Bytef*)z->writebuffer;
+ z->output->write(z->output, z->writebuffer, z->zs.next_out - (Bytef*)z->writebuffer);
+ z->zs.next_out = z->writebuffer;
+ z->zs.avail_out = ZLIB_BUFFER_SIZE;
+ }
+ /* TODO: how will zlib let us know it needs more buffer space? */
+ break;
+ }
+ return;
+#else
+ fprintf(stderr, "Error: swftools was compiled without zlib support");
+ exit(1);
+#endif
+}
+
static void writer_zlibdeflate_finish(writer_t*writer)
{
#ifdef HAVE_ZLIB
- struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal;
+ zlibdeflate_t*z = (zlibdeflate_t*)writer->internal;
writer_t*output;
int ret;
if(writer->type != WRITER_TYPE_ZLIB) {
ret != Z_STREAM_END) zlib_error(ret, "bitio:deflate_finish", &z->zs);
if(z->zs.next_out != z->writebuffer) {
+ writer->pos += z->zs.next_out - (Bytef*)z->writebuffer;
z->output->write(z->output, z->writebuffer, z->zs.next_out - (Bytef*)z->writebuffer);
z->zs.next_out = z->writebuffer;
z->zs.avail_out = ZLIB_BUFFER_SIZE;
void writer_init_zlibdeflate(writer_t*w, writer_t*output)
{
#ifdef HAVE_ZLIB
- struct zlibdeflate_t*z;
+ zlibdeflate_t*z;
int ret;
memset(w, 0, sizeof(writer_t));
- z = (struct zlibdeflate_t*)malloc(sizeof(struct zlibdeflate_t));
- memset(z, 0, sizeof(struct zlibdeflate_t));
+ z = (zlibdeflate_t*)malloc(sizeof(zlibdeflate_t));
+ memset(z, 0, sizeof(zlibdeflate_t));
w->internal = z;
w->write = writer_zlibdeflate_write;
+ w->flush = writer_zlibdeflate_flush;
w->finish = writer_zlibdeflate_finish;
w->type = WRITER_TYPE_ZLIB;
w->pos = 0;
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;
+ float f;
+ r->read(r, &f, 4);
+ return f;
+
+ 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;
}
}
void writer_writeFloat(writer_t*w, float f)
{
- unsigned long v = *(unsigned long*)&f;
+ w->write(w, &f, 4);
+ return;
+
+ unsigned v = *(unsigned*)&f;
unsigned char b1 = v;
unsigned char b2 = v>>8;
unsigned char b3 = v>>16;
w->write(w, &b7, 1);
w->write(w, &b8, 1);
}
-
-
git.asbjorn.biz / swftools.git / blobdiff