From e462d36034db2d5800e709456545087d50d14fb3 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Tue, 6 May 2003 11:40:06 +0000
Subject: [PATCH] moved to ../lib

---
 src/q.c |  441 ---------------------------------------------------------------
 src/q.h |  101 ---------------
 2 files changed, 542 deletions(-)
 delete mode 100644 src/q.c
 delete mode 100644 src/q.h

diff --git a/src/q.c b/src/q.c
deleted file mode 100644
index 2c01d45..0000000
--- a/src/q.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* q.c
-
-   Part of the swftools package.
-   
-   Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
-
-   This file is distributed under the GPL, see file COPYING for details */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <memory.h>
-#include "q.h"
-
-// ------------------------------- malloc, alloc routines ---------------------
-
-#ifndef STRNDUP
-char* strndup(const char*str, int size)
-{
-    char*m = (char*)malloc(size+1);
-    memcpy(m, str, size);
-    m[size] = 0;
-    return m;
-}
-#endif
-void* qmalloc_internal(int len)
-{
-    void*val = malloc(len);
-    if(!val) {
-	printf("memory error! Couldn't reserve %d bytes\n", len);
-	fprintf(stderr, "memory error! Couldn't reserve %d bytes\n", len);
-	exit(1);
-    }
-    return val;
-}
-void* qrealloc_internal(void*old, int len)
-{
-    void*val = realloc(old, len);
-    if(!val) {
-	printf("memory error! Couldn't reserve %d bytes\n", len);
-	fprintf(stderr, "memory error! Couldn't reserve %d bytes\n", len);
-	exit(1);
-    }
-    return val;
-}
-void qfree_internal(void*old)
-{
-    free(old);
-}
-char*qstrdup(const char*string)
-{
-    return strdup(string);
-}
-char*qstrndup(const char*string, int len)
-{
-    return strndup(string, len);
-}
-
-// ------------------------------- mem_t --------------------------------------
-
-void mem_init(mem_t*mem)
-{
-    memset(mem, 0, sizeof(mem_t));
-}
-void mem_clear(mem_t*mem)
-{
-    free(mem->buffer);
-}
-void mem_destroy(mem_t*mem)
-{
-    mem_clear(mem);
-    free(mem);
-}
-static int mem_put_(mem_t*m,void*data, int length, int null)
-{
-    int n = m->pos;
-    m->pos += length + (null?1:0);
-    if(m->pos > m->len)
-    { 
-	//m->len += 1024>length?1024:(null?length*2:length);
-
-	m->len *= 2;
-	while(m->len < m->pos)
-	    m->len += 64;
-
-	m->buffer = m->buffer?(char*)realloc(m->buffer,m->len):(char*)malloc(m->len);
-    }
-    memcpy(&m->buffer[n], data, length);
-    if(null)
-	m->buffer[n + length] = 0;
-    return n;
-}
-int mem_put(mem_t*m,void*data, int length)
-{
-    return mem_put_(m, data, length, 0);
-}
-int mem_putstring(mem_t*m,string_t str)
-{
-    return mem_put_(m, str.str, str.len, 1);
-}
-
-// ------------------------------- 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)
-{
-    str->len = len;
-    str->str = text;
-}
-void string_set(string_t*str, char*text)
-{
-    str->len = strlen(text);
-    str->str = text;
-}
-void string_dup2(string_t*str, const char*text, int len)
-{
-    str->len = len;
-    str->str = strndup(text, len);
-}
-void string_dup(string_t*str, const char*text)
-{
-    str->len = strlen(text);
-    str->str = strdup(text);
-}
-int string_equals(string_t*str, const char*text)
-{
-    int l = strlen(text);
-    if(str->len == l && !strncmp(str->str, text, l))
-	return 1;
-    return 0;
-}
-int string_equals2(string_t*str, string_t*str2)
-{
-    if(str->len == str2->len && !strncmp(str->str, str2->str, str->len))
-	return 1;
-    return 0;
-}
-char* string_cstr(string_t*str)
-{
-    return strndup(str->str, str->len);
-}
-
-// ------------------------------- stringarray_t ------------------------------
-
-typedef struct _stringarray_internal_t
-{
-    mem_t data;
-    mem_t pos;
-    int num;
-} stringarray_internal_t;
-void stringarray_init(stringarray_t*sa)
-{
-    stringarray_internal_t*s;
-    sa->internal = (stringarray_internal_t*)malloc(sizeof(stringarray_internal_t)); 
-    memset(sa->internal, 0, sizeof(stringarray_internal_t));
-    s = (stringarray_internal_t*)sa->internal;
-    mem_init(&s->data);
-    mem_init(&s->pos);
-}
-void stringarray_put(stringarray_t*sa, string_t str)
-{
-    stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    int pos;
-    pos = mem_putstring(&s->data, str);
-    mem_put(&s->pos, &pos, sizeof(int));
-    s->num++;
-}
-char* stringarray_at(stringarray_t*sa, int pos)
-{
-    stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    int p;
-    if(pos<0 || pos>=s->num)
-	return 0;
-    p = *(int*)&s->pos.buffer[pos*sizeof(int)];
-    if(p<0)
-	return 0;
-    return &s->data.buffer[p];
-}
-string_t stringarray_at2(stringarray_t*sa, int pos)
-{
-    string_t s;
-    s.str = stringarray_at(sa, pos);
-    s.len = s.str?strlen(s.str):0;
-    return s;
-}
-void stringarray_del(stringarray_t*sa, int pos)
-{
-    stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    *(int*)&s->pos.buffer[pos*sizeof(int)] = -1;
-}
-int stringarray_find(stringarray_t*sa, string_t* str)
-{
-    stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    int t;
-    for(t=0;t<s->num;t++) {
-	string_t s = stringarray_at2(sa, t);
-	if(s.str && string_equals2(&s, str)) {
-	    return t;
-	}
-    }
-    return -1;
-}
-void stringarray_clear(stringarray_t*sa)
-{
-    stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    mem_clear(&s->data);
-    mem_clear(&s->pos);
-    free(s);
-}
-void stringarray_destroy(stringarray_t*sa)
-{
-    stringarray_clear(sa);
-    free(sa);
-}
-
-
-// ------------------------------- map_t --------------------------------------
-
-typedef struct _map_internal_t
-{
-    stringarray_t keys;
-    stringarray_t values;
-    int num;
-} map_internal_t;
-
-void map_init(map_t*map)
-{
-    map_internal_t*m;
-    map->internal = (map_internal_t*)malloc(sizeof(map_internal_t));
-    memset(map->internal, 0, sizeof(map_internal_t));
-    m = (map_internal_t*)map->internal;
-    stringarray_init(&m->keys);
-    stringarray_init(&m->values);
-}
-void map_put(map_t*map, string_t t1, string_t t2)
-{
-    map_internal_t*m = (map_internal_t*)map->internal;
-    stringarray_put(&m->keys, t1);
-    stringarray_put(&m->values, t2);
-    m->num++;
-}
-char* map_lookup(map_t*map, const char*name)
-{
-    int s;
-    map_internal_t*m = (map_internal_t*)map->internal;
-    string_t str;
-    string_set(&str, (char*)name);
-    s = stringarray_find(&m->keys, &str);
-    if(s>=0) {
-	string_t s2 = stringarray_at2(&m->values, s);
-	return s2.str;
-    }
-    return 0;
-}
-void map_dump(map_t*map, FILE*fi, const char*prefix)
-{
-    int t;
-    map_internal_t*m = (map_internal_t*)map->internal;
-    for(t=0;t<m->num;t++) {
-	string_t s1 = stringarray_at2(&m->keys, t);
-	string_t s2 = stringarray_at2(&m->values, t);
-	fprintf(fi, "%s%s=%s\n", prefix, s1.str, s2.str);
-    }
-}
-void map_clear(map_t*map)
-{
-    map_internal_t*m = (map_internal_t*)map->internal;
-    stringarray_clear(&m->keys);
-    stringarray_clear(&m->values);
-    free(m);
-}
-void map_destroy(map_t*map)
-{
-    map_clear(map);
-    free(map);
-}
-
-// ------------------------------- dictionary_t -------------------------------
-
-typedef struct _dictionary_internal_t
-{
-    stringarray_t keys;
-    mem_t values;
-    int num;
-} dictionary_internal_t;
-
-void dictionary_init(dictionary_t*dict)
-{
-    dictionary_internal_t*d;
-    dict->internal = (dictionary_internal_t*)malloc(sizeof(dictionary_internal_t));
-    memset(dict->internal, 0, sizeof(dictionary_internal_t));
-    d = (dictionary_internal_t*)dict->internal;
-    stringarray_init(&d->keys);
-    mem_init(&d->values);
-}
-void dictionary_put(dictionary_t*dict, string_t t1, void* t2)
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    int s=0;
-    s = stringarray_find(&d->keys, &t1);
-    if(s>=0) {
-	/* replace */
-	*(void**)(&d->values.buffer[s*sizeof(void*)]) = t2;
-    } else {
-	stringarray_put(&d->keys, t1);
-	mem_put(&d->values, &t2, sizeof(void*));
-	d->num++;
-    }
-}
-void dictionary_put2(dictionary_t*dict, const char*t1, void* t2)
-{
-    string_t s;
-    string_set(&s, (char*)t1);
-    dictionary_put(dict, s, t2);
-}
-void* dictionary_lookup(dictionary_t*dict, const char*name)
-{
-    int s;
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    string_t str;
-    string_set(&str, (char*)name);
-    s = stringarray_find(&d->keys, &str);
-    if(s>=0) {
-	return *(void**)&d->values.buffer[sizeof(void*)*s];
-    }
-    return 0;
-}
-void dictionary_dump(dictionary_t*dict, FILE*fi, const char*prefix)
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    int t;
-    for(t=0;t<d->num;t++) {
-	string_t s1 = stringarray_at2(&d->keys, t);
-	fprintf(fi, "%s%s=%08x\n", prefix, s1.str, *(void**)&d->values.buffer[sizeof(void*)*t]);
-    }
-}
-void dictionary_del(dictionary_t*dict, const char* name)
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    int s;
-    string_t str;
-    string_set(&str, (char*)name);
-    s = stringarray_find(&d->keys, &str);
-    if(s>=0) {
-	*(void**)(&d->values.buffer[s*sizeof(void*)]) = 0;
-	stringarray_del(&d->keys, s);
-    }
-}
-void dictionary_clear(dictionary_t*dict)
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    stringarray_clear(&d->keys);
-    mem_clear(&d->values);
-    free(d);
-}
-void dictionary_destroy(dictionary_t*dict)
-{
-    dictionary_clear(dict);
-    free(dict);
-}
diff --git a/src/q.h b/src/q.h
deleted file mode 100644
index b530447..0000000
--- a/src/q.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* q.h
-   Header file for q.c.
-
-   Part of the swftools package.
-   
-   Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
-
-   This file is distributed under the GPL, see file COPYING for details */
-
-#ifndef __q_h__
-#define __q_h__
-
-#include <stdio.h>
-
-/* dynamically growing mem section */
-typedef struct _mem_t {
-    char*buffer;
-    int len;
-    int pos;
-} mem_t;
-
-typedef struct _ringbuffer_t
-{
-    void*internal;
-    int available;
-} ringbuffer_t;
-
-/* non-nul terminated string */
-typedef struct _string_t {
-    char*str;
-    int len;
-} string_t;
-
-/* key/value pairs of strings */
-typedef struct _map_t {
-    void*internal;
-} map_t;
-
-/* (void*)s referenced by strings */
-typedef struct _dictionary_t {
-    void*internal;
-} dictionary_t;
-
-/* array of strings */
-typedef struct _stringarray_t
-{
-    void*internal;
-} stringarray_t;
-
-void mem_init(mem_t*mem);
-int mem_put(mem_t*m, void*data, int length);
-int mem_putstring(mem_t*m, string_t str);
-void mem_clear(mem_t*mem);
-void mem_destroy(mem_t*mem);
-
-void ringbuffer_init(ringbuffer_t*r);
-void ringbuffer_put(ringbuffer_t*r, void*buf, int size);
-int ringbuffer_read(ringbuffer_t*r, void*buf, int size);
-void ringbuffer_clear(ringbuffer_t*r);
-
-void string_set(string_t*str, char*text);
-void string_set2(string_t*str, char*text, int len);
-void string_dup(string_t*str, const char*text);
-void string_dup2(string_t*str, const char*text, int len);
-int string_equals(string_t*str, const char*text);
-
-void stringarray_init(stringarray_t*sa);
-void stringarray_put(stringarray_t*sa, string_t str);
-char* stringarray_at(stringarray_t*sa, int pos);
-string_t stringarray_at2(stringarray_t*sa, int pos);
-int stringarray_find(stringarray_t*sa, string_t*str);
-void stringarray_clear(stringarray_t*sa);
-void stringarray_destroy(stringarray_t*sa);
-
-void map_init(map_t*map);
-void map_put(map_t*map, string_t t1, string_t t2);
-char* map_lookup(map_t*map, const char*name);
-void map_dump(map_t*map, FILE*fi, const char*prefix);
-void map_clear(map_t*map);
-void map_destroy(map_t*map);
-
-void dictionary_init(dictionary_t*dict);
-void dictionary_put(dictionary_t*dict, string_t t1, void* t2);
-void dictionary_put2(dictionary_t*dict, const char* t1, void* t2);
-void* dictionary_lookup(dictionary_t*dict, const char*name);
-void dictionary_dump(dictionary_t*dict, FILE*fi, const char*prefix);
-void dictionary_del(dictionary_t*dict, const char* name);
-void dictionary_clear(dictionary_t*dict);
-void dictionary_destroy(dictionary_t*dict);
-
-char* strndup(const char*str, int size);
-
-void* qmalloc_internal(int len);
-void* qrealloc_internal(void*old, int len);
-void qfree_internal(void*old);
-
-#define qmalloc(len) qmalloc_internal(len)
-#define qrealloc(old, len) qmalloc_internal(old, len)
-#define qfree(old) qmalloc_internal(old)
-
-#endif //__q_h__
-- 
1.7.10.4