X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fbitio.c;h=73976046e59852ef265bea9ef563b0a779782aee;hb=f72efb3e0b08321fe70a478bf939c312ed7564ce;hp=eab01f278567d50c4cbfddf0ecd10da33945270e;hpb=54806b7075495c4299ba9f6de8c65baadaf12e32;p=swftools.git

diff --git a/lib/bitio.c b/lib/bitio.c
index eab01f2..7397604 100644
--- a/lib/bitio.c
+++ b/lib/bitio.c
@@ -89,7 +89,7 @@ static int reader_memread(struct reader_t*reader, void* data, int len)
 	return len;
     } else {
 	memcpy(data, &mr->data[reader->pos], mr->length - reader->pos);
-	reader->pos = mr->length;
+	reader->pos += mr->length;
 	return mr->length - reader->pos;
     }
 }
@@ -395,6 +395,7 @@ void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input)
     reader_resetbits(r);
 #else
     fprintf(stderr, "Error: swftools was compiled without zlib support");
+    exit(1);
 #endif
 }
 
@@ -575,42 +576,3 @@ void reader_resetbits(struct reader_t*r)
     r->bitpos = 8;
 
 }
-U8 readU8(struct reader_t*r)
-{
-    U8 b;
-    r->read(r, &b, 1);
-    return b;
-}
-U16 readU16(struct reader_t*r)
-{
-    U8 b[2];
-    r->read(r, b, 2);
-    return b[0]|b[1]<<8;
-}
-U32 readU32(struct reader_t*r)
-{
-    U8 b[4];
-    r->read(r, b, 4);
-    return b[0]|b[1]<<8|b[2]<<16|b[3]<<24;
-}
-void writeU8(struct writer_t*wr, U8 b)
-{
-    wr->write(wr, &b, 1);
-}
-void writeU16(struct writer_t*wr, U16 w)
-{
-    U8 b[2];
-    b[0] = w;
-    b[1] = w>>8;
-    wr->write(wr, b, 2);
-}
-void writeU32(struct writer_t*wr, U32 d) 
-{
-    U8 b[4];
-    b[0] = d;
-    b[1] = d>>8;
-    b[2] = d>>16;
-    b[3] = d>>24;
-    wr->write(wr, b, 4);
-}
-