X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fq.c;h=2c01d45cea851e059b5213d4f15fed3b81506786;hb=ca7b18586e9fac43d99d061602fb199e7f230f4c;hp=9142eecb428fe71e3d6c665f209b99431ec206f2;hpb=73168a7f7ca3a242980071be43b5454456374aae;p=swftools.git

diff --git a/src/q.c b/src/q.c
index 9142eec..2c01d45 100644
--- a/src/q.c
+++ b/src/q.c
@@ -82,7 +82,7 @@ static int mem_put_(mem_t*m,void*data, int length, int null)
 	while(m->len < m->pos)
 	    m->len += 64;
 
-	m->buffer = m->buffer?realloc(m->buffer,m->len):malloc(m->len);
+	m->buffer = m->buffer?(char*)realloc(m->buffer,m->len):(char*)malloc(m->len);
     }
     memcpy(&m->buffer[n], data, length);
     if(null)
@@ -98,7 +98,90 @@ int mem_putstring(mem_t*m,string_t str)
     return mem_put_(m, str.str, str.len, 1);
 }
 
-// ------------------------------- string_t ------------------------------------
+// ------------------------------- ringbuffer_t -------------------------------
+
+typedef struct _ringbuffer_internal_t
+{
+    unsigned char*buffer;
+    int readpos;
+    int writepos;
+    int buffersize;
+} ringbuffer_internal_t;
+
+void ringbuffer_init(ringbuffer_t*r)
+{
+    ringbuffer_internal_t*i = (ringbuffer_internal_t*)malloc(sizeof(ringbuffer_internal_t)); 
+    memset(r, 0, sizeof(ringbuffer_t));
+    memset(i, 0, sizeof(ringbuffer_internal_t));
+    r->internal = i;
+    i->buffer = (unsigned char*)malloc(1024);
+    i->buffersize = 1024;
+}
+int ringbuffer_read(ringbuffer_t*r, void*buf, int len)
+{
+    unsigned char* data = (unsigned char*)buf;
+    ringbuffer_internal_t*i = (ringbuffer_internal_t*)r->internal;
+    if(r->available < len)
+	len = r->available;
+    if(!len)
+	return 0;
+    if(i->readpos + len > i->buffersize) {
+	int read1 = i->buffersize-i->readpos;
+	memcpy(data, &i->buffer[i->readpos], read1);
+	memcpy(&data[read1], &i->buffer[0], len - read1);
+	i->readpos = len - read1;
+    } else {
+	memcpy(data, &i->buffer[i->readpos], len);
+	i->readpos += len;
+	i->readpos %= i->buffersize;
+    }
+    r->available -= len;
+    return len;
+}
+void ringbuffer_put(ringbuffer_t*r, void*buf, int len)
+{
+    unsigned char* data = (unsigned char*)buf;
+    ringbuffer_internal_t*i = (ringbuffer_internal_t*)r->internal;
+    
+    if(i->buffersize - r->available < len)
+    {
+	unsigned char* buf2;
+	int newbuffersize = i->buffersize;
+	int oldavailable = r->available;
+	newbuffersize*=3;newbuffersize/=2; /*grow at least by 50% each time */
+
+	if(newbuffersize < r->available + len)
+	    newbuffersize = r->available + len + 1024;
+
+	buf2 = (unsigned char*)malloc(newbuffersize);
+	ringbuffer_read(r, buf2, r->available);
+	free(i->buffer);
+	i->buffer = buf2;
+	i->buffersize = newbuffersize;
+	i->readpos = 0;
+	i->writepos = oldavailable;
+	r->available = oldavailable;
+    }
+    if(i->writepos + len > i->buffersize) {
+	int read1 = i->buffersize-i->writepos;
+	memcpy(&i->buffer[i->writepos], data, read1);
+	memcpy(&i->buffer[0], &data[read1], len - read1);
+	i->writepos = len - read1;
+    } else {
+	memcpy(&i->buffer[i->writepos], data, len);
+	i->writepos += len;
+	i->writepos %= i->buffersize;
+    }
+    r->available += len;
+}
+void ringbuffer_clear(ringbuffer_t*r)
+{
+    ringbuffer_internal_t*i = (ringbuffer_internal_t*)r->internal;
+    free(i->buffer);
+    free(i);
+}
+
+// ------------------------------- string_t -----------------------------------
 
 void string_set2(string_t*str, char*text, int len)
 {
@@ -273,7 +356,7 @@ void map_destroy(map_t*map)
     free(map);
 }
 
-// ------------------------------- dictionary_t --------------------------------------
+// ------------------------------- dictionary_t -------------------------------
 
 typedef struct _dictionary_internal_t
 {