X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fbitio.c;h=97c864ace797bf17292f3d8f4ad317bcf94ac36f;hb=cf209c8c9faa374746ac865ea7cecd356dcc41c8;hp=8d17006c039524061fb499a12f52f9925d1a607e;hpb=7defd9d32b1158f630d0759886ede4330f09535b;p=swftools.git

diff --git a/lib/bitio.c b/lib/bitio.c
index 8d17006..97c864a 100644
--- a/lib/bitio.c
+++ b/lib/bitio.c
@@ -89,15 +89,12 @@ static int reader_memread(reader_t*reader, void* data, int len)
 {
     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)
 {
@@ -199,9 +196,9 @@ static int writer_growmemwrite_write(writer_t*w, void* data, int len)
 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));
@@ -233,15 +230,15 @@ void writer_growmemwrite_reset(writer_t*w)
 }
 void writer_init_growingmemwriter(writer_t*w, U32 grow)
 {
-    struct growmemwrite_t *mr;
-    mr = (struct growmemwrite_t *)malloc(sizeof(struct growmemwrite_t));
-    mr->length = 4096;
-    mr->data = (unsigned char *)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;
@@ -667,7 +664,7 @@ char*reader_readString(reader_t*r)
 	    break;
     }
     char*string = (char*)writer_growmemwrite_getmem(&g);
-    writer_growmemwrite_finish(&g);
+    g.finish(&g);
     return string;
 }