2.5 BLI_blenlib cleanup

DONE:
* moved almost all declarations from BLI_blenlib.h into their own proper header files.
* BLI_blenlib.h still includes all the declarations for convenience and to avoid changes in existing code
* split util.c into several files, where it wasn't done already
*    DynamicList -> dynamiclist, 
*    ListBase    -> listbase, 
*    String utility functions -> string.c
* removed a few unused macros and functions, if they're needed back, they're still in svn ;)
TODO:
* btempdir global
* further cleanup in the code of the different modules (especially util.c)

1 files changed, 21 insertions, 707 deletions

diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index d3cfdf6417c..f363e9c4cc5 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -102,23 +102,6 @@ static int add_win32_extension(char *name);
 
 /* implementation */
 
-/* Ripped this from blender.c */
-void addlisttolist(ListBase *list1, ListBase *list2)
-{
-	if (list2->first==0) return;
-
-	if (list1->first==0) {
-		list1->first= list2->first;
-		list1->last= list2->last;
-	}
-	else {
-		((Link *)list1->last)->next= list2->first;
-		((Link *)list2->first)->prev= list1->last;
-		list1->last= list2->last;
-	}
-	list2->first= list2->last= 0;
-}
-
 int BLI_stringdec(char *string, char *kop, char *start, unsigned short *numlen)
 {
 	unsigned short len, len2, nums = 0, nume = 0;
@@ -301,574 +284,6 @@ void BLI_uniquename(ListBase *list, void *vlink, char defname[], short name_offs
 	}
 }
 
-
-void BLI_addhead(ListBase *listbase, void *vlink)
-{
-	Link *link= vlink;
-
-	if (link == NULL) return;
-	if (listbase == NULL) return;
-
-	link->next = listbase->first;
-	link->prev = NULL;
-
-	if (listbase->first) ((Link *)listbase->first)->prev = link;
-	if (listbase->last == NULL) listbase->last = link;
-	listbase->first = link;
-}
-
-
-void BLI_addtail(ListBase *listbase, void *vlink)
-{
-	Link *link= vlink;
-
-	if (link == NULL) return;
-	if (listbase == NULL) return;
-
-	link->next = NULL;
-	link->prev = listbase->last;
-
-	if (listbase->last) ((Link *)listbase->last)->next = link;
-	if (listbase->first == 0) listbase->first = link;
-	listbase->last = link;
-}
-
-
-void BLI_remlink(ListBase *listbase, void *vlink)
-{
-	Link *link= vlink;
-
-	if (link == NULL) return;
-	if (listbase == NULL) return;
-
-	if (link->next) link->next->prev = link->prev;
-	if (link->prev) link->prev->next = link->next;
-
-	if (listbase->last == link) listbase->last = link->prev;
-	if (listbase->first == link) listbase->first = link->next;
-}
-
-
-void BLI_freelinkN(ListBase *listbase, void *vlink)
-{
-	Link *link= vlink;
-
-	if (link == NULL) return;
-	if (listbase == NULL) return;
-
-	BLI_remlink(listbase,link);
-	MEM_freeN(link);
-}
-
-
-void BLI_insertlink(ListBase *listbase, void *vprevlink, void *vnewlink)
-{
-	Link *prevlink= vprevlink;
-	Link *newlink= vnewlink;
-
-	/* newlink comes after prevlink */
-	if (newlink == NULL) return;
-	if (listbase == NULL) return;
-	
-	/* empty list */
-	if (listbase->first == NULL) { 
-		
-		listbase->first= newlink;
-		listbase->last= newlink;
-		return;
-	}
-	
-	/* insert before first element */
-	if (prevlink == NULL) {	
-		newlink->next= listbase->first;
-		newlink->prev= 0;
-		newlink->next->prev= newlink;
-		listbase->first= newlink;
-		return;
-	}
-
-	/* at end of list */
-	if (listbase->last== prevlink) 
-		listbase->last = newlink;
-
-	newlink->next= prevlink->next;
-	prevlink->next= newlink;
-	if (newlink->next) newlink->next->prev= newlink;
-	newlink->prev= prevlink;
-}
-
-/* This uses insertion sort, so NOT ok for large list */
-void BLI_sortlist(ListBase *listbase, int (*cmp)(void *, void *))
-{
-	Link *current = NULL;
-	Link *previous = NULL;
-	Link *next = NULL;
-	
-	if (cmp == NULL) return;
-	if (listbase == NULL) return;
-
-	if (listbase->first != listbase->last)
-	{
-		for( previous = listbase->first, current = previous->next; current; current = next )
-		{
-			next = current->next;
-			previous = current->prev;
-			
-			BLI_remlink(listbase, current);
-			
-			while(previous && cmp(previous, current) == 1)
-			{
-				previous = previous->prev;
-			}
-			
-			BLI_insertlinkafter(listbase, previous, current);
-		}
-	}
-}
-
-void BLI_insertlinkafter(ListBase *listbase, void *vprevlink, void *vnewlink)
-{
-	Link *prevlink= vprevlink;
-	Link *newlink= vnewlink;
-
-	/* newlink before nextlink */
-	if (newlink == NULL) return;
-	if (listbase == NULL) return;
-
-	/* empty list */
-	if (listbase->first == NULL) { 
-		listbase->first= newlink;
-		listbase->last= newlink;
-		return;
-	}
-	
-	/* insert at head of list */
-	if (prevlink == NULL) {	
-		newlink->prev = NULL;
-		newlink->next = listbase->first;
-		((Link *)listbase->first)->prev = newlink;
-		listbase->first = newlink;
-		return;
-	}
-
-	/* at end of list */
-	if (listbase->last == prevlink) 
-		listbase->last = newlink;
-
-	newlink->next = prevlink->next;
-	newlink->prev = prevlink;
-	prevlink->next = newlink;
-	if (newlink->next) newlink->next->prev = newlink;
-}
-
-void BLI_insertlinkbefore(ListBase *listbase, void *vnextlink, void *vnewlink)
-{
-	Link *nextlink= vnextlink;
-	Link *newlink= vnewlink;
-
-	/* newlink before nextlink */
-	if (newlink == NULL) return;
-	if (listbase == NULL) return;
-
-	/* empty list */
-	if (listbase->first == NULL) { 
-		listbase->first= newlink;
-		listbase->last= newlink;
-		return;
-	}
-	
-	/* insert at end of list */
-	if (nextlink == NULL) {	
-		newlink->prev= listbase->last;
-		newlink->next= 0;
-		((Link *)listbase->last)->next= newlink;
-		listbase->last= newlink;
-		return;
-	}
-
-	/* at beginning of list */
-	if (listbase->first== nextlink) 
-		listbase->first = newlink;
-
-	newlink->next= nextlink;
-	newlink->prev= nextlink->prev;
-	nextlink->prev= newlink;
-	if (newlink->prev) newlink->prev->next= newlink;
-}
-
-
-void BLI_freelist(ListBase *listbase)
-{
-	Link *link, *next;
-
-	if (listbase == NULL) 
-		return;
-	
-	link= listbase->first;
-	while (link) {
-		next= link->next;
-		free(link);
-		link= next;
-	}
-	
-	listbase->first= NULL;
-	listbase->last= NULL;
-}
-
-void BLI_freelistN(ListBase *listbase)
-{
-	Link *link, *next;
-
-	if (listbase == NULL) return;
-	
-	link= listbase->first;
-	while (link) {
-		next= link->next;
-		MEM_freeN(link);
-		link= next;
-	}
-	
-	listbase->first= NULL;
-	listbase->last= NULL;
-}
-
-
-int BLI_countlist(ListBase *listbase)
-{
-	Link *link;
-	int count = 0;
-	
-	if (listbase) {
-		link = listbase->first;
-		while (link) {
-			count++;
-			link= link->next;
-		}
-	}
-	return count;
-}
-
-void *BLI_findlink(ListBase *listbase, int number)
-{
-	Link *link = NULL;
-
-	if (number >= 0) {
-		link = listbase->first;
-		while (link != NULL && number != 0) {
-			number--;
-			link = link->next;
-		}
-	}
-
-	return link;
-}
-
-int BLI_findindex(ListBase *listbase, void *vlink)
-{
-	Link *link= NULL;
-	int number= 0;
-	
-	if (listbase == NULL) return -1;
-	if (vlink == NULL) return -1;
-	
-	link= listbase->first;
-	while (link) {
-		if (link == vlink)
-			return number;
-		
-		number++;
-		link= link->next;
-	}
-	
-	return -1;
-}
-
-void BLI_duplicatelist(ListBase *list1, ListBase *list2)  /* copy from 2 to 1 */
-{
-	struct Link *link1, *link2;
-	
-	list1->first= list1->last= 0;
-	
-	link2= list2->first;
-	while(link2) {
-		
-		link1= MEM_dupallocN(link2);
-		BLI_addtail(list1, link1);
-		
-		link2= link2->next;
-	}	
-}
-
-
-/*=====================================================================================*/
-/* Methods for access array (realloc) */
-/*=====================================================================================*/
-
-/* remove item with index */
-static void rem_array_item(struct DynamicArray *da, unsigned int index)
-{
-	da->items[index]=NULL;
-	da->count--;
-	if(index==da->last_item_index){
-		while((!da->items[da->last_item_index]) && (da->last_item_index>0)){
-			da->last_item_index--;
-		}
-	}
-}
-
-/* add array (if needed, then realloc) */
-static void add_array_item(struct DynamicArray *da, void *item, unsigned int index)
-{
-	/* realloc of access array */
-	if(da->max_item_index < index){
-		unsigned int i, max = da->max_item_index;
-		void **nitems;
-
-		do {
-			da->max_item_index += PAGE_SIZE;	/* OS can allocate only PAGE_SIZE Bytes */
-		} while(da->max_item_index<=index);
-
-		nitems = (void**)MEM_mallocN(sizeof(void*)*(da->max_item_index+1), "dlist access array");
-		for(i=0;i<=max;i++)
-			nitems[i] = da->items[i];
-
-		/* set rest pointers to the NULL */
-		for(i=max+1; i<=da->max_item_index; i++)
-			nitems[i]=NULL;
-
-		MEM_freeN(da->items);		/* free old access array */
-		da->items = nitems;
-	}
-
-	da->items[index] = item;
-	da->count++;
-	if(index > da->last_item_index) da->last_item_index = index;
-}
-
-/* free access array */
-static void destroy_array(DynamicArray *da)
-{
-	da->count=0;
-	da->last_item_index=0;
-	da->max_item_index=0;
-	MEM_freeN(da->items);
-	da->items = NULL;
-}
-
-/* initialize dynamic array */
-static void init_array(DynamicArray *da)
-{
-	unsigned int i;
-
-	da->count=0;
-	da->last_item_index=0;
-	da->max_item_index = PAGE_SIZE-1;
-	da->items = (void*)MEM_mallocN(sizeof(void*)*(da->max_item_index+1), "dlist access array");
-	for(i=0; i<=da->max_item_index; i++) da->items[i]=NULL;
-}
-
-/* reinitialize dynamic array */
-static void reinit_array(DynamicArray *da)
-{
-	destroy_array(da);
-	init_array(da);
-}
-
-/*=====================================================================================*/
-/* Methods for two way dynamic list with access array */
-/*=====================================================================================*/
-
-/* create new two way dynamic list with access array from two way dynamic list
- * it doesn't copy any items to new array or something like this It is strongly
- * recomended to use BLI_dlist_ methods for adding/removing items from dynamic list
- * unless you can end with inconsistence system !!! */
-DynamicList *BLI_dlist_from_listbase(ListBase *lb)
-{
-	DynamicList *dlist;
-	Link *item;
-	int i=0, count;
-	
-	if(!lb) return NULL;
-	
-	count = BLI_countlist(lb);
-
-	dlist = MEM_mallocN(sizeof(DynamicList), "temp dynamic list");
-	/* ListBase stuff */
-	dlist->lb.first = lb->first;
-	dlist->lb.last = lb->last;
-	/* access array stuff */
-	dlist->da.count=count;
-	dlist->da.max_item_index = count-1;
-	dlist->da.last_item_index = count -1;
-	dlist->da.items = (void*)MEM_mallocN(sizeof(void*)*count, "temp dlist access array");
-
-	item = (Link*)lb->first;
-	while(item){
-		dlist->da.items[i] = (void*)item;
-		item = item->next;
-		i++;
-	}
-
-	/* to prevent you of using original ListBase :-) */
-	lb->first = lb->last = NULL;
-
-	return dlist;
-}
-
-/* take out ListBase from DynamicList and destroy all temporary structures of DynamicList */
-ListBase *BLI_listbase_from_dlist(DynamicList *dlist, ListBase *lb)
-{
-	if(!dlist) return NULL;
-
-	if(!lb) lb = (ListBase*)MEM_mallocN(sizeof(ListBase), "ListBase");
-	
-	lb->first = dlist->lb.first;
-	lb->last = dlist->lb.last;
-
-	/* free all items of access array */
-	MEM_freeN(dlist->da.items);
-	/* free DynamicList*/
-	MEM_freeN(dlist);
-
-	return lb;
-}
-
-/* return pointer at item from th dynamic list with access array */
-void *BLI_dlist_find_link(DynamicList *dlist, unsigned int index)
-{
-	if(!dlist || !dlist->da.items) return NULL;
-
-	if((index <= dlist->da.last_item_index) && (index >= 0) && (dlist->da.count>0)){
-      		return dlist->da.items[index];
-	}
-	else {
-		return NULL;
-	}
-}
-
-/* return count of items in the dynamic list with access array */
-unsigned int BLI_count_items(DynamicList *dlist)
-{
-	if(!dlist) return 0;
-
-	return dlist->da.count;
-}
-
-/* free item from the dynamic list with access array */
-void BLI_dlist_free_item(DynamicList *dlist, unsigned int index)
-{
-	if(!dlist || !dlist->da.items) return;
-	
-	if((index <= dlist->da.last_item_index) && (dlist->da.items[index])){
-		BLI_freelinkN(&(dlist->lb), dlist->da.items[index]);
-		rem_array_item(&(dlist->da), index);
-	}
-}
-
-/* remove item from the dynamic list with access array */
-void BLI_dlist_rem_item(DynamicList *dlist, unsigned int index)
-{
-	if(!dlist || !dlist->da.items) return;
-	
-	if((index <= dlist->da.last_item_index) && (dlist->da.items[index])){
-		BLI_remlink(&(dlist->lb), dlist->da.items[index]);
-		rem_array_item(&(dlist->da), index);
-	}
-}
-
-/* add item to the dynamic list with access array (index) */
-void* BLI_dlist_add_item_index(DynamicList *dlist, void *item, unsigned int index)
-{
-	if(!dlist || !dlist->da.items) return NULL;
-
-	if((index <= dlist->da.max_item_index) && (dlist->da.items[index])) {
-		/* you can't place item at used index */
-		return NULL;
-	}
-	else {
-		add_array_item(&(dlist->da), item, index);
-		BLI_addtail(&(dlist->lb), item);
-		return item;
-	}
-}
-
-/* destroy dynamic list with access array */
-void BLI_dlist_destroy(DynamicList *dlist)
-{
-	if(!dlist) return;
-
-	BLI_freelistN(&(dlist->lb));
-	destroy_array(&(dlist->da));
-}
-
-/* initialize dynamic list with access array */
-void BLI_dlist_init(DynamicList *dlist)
-{
-	if(!dlist) return;
-
-	dlist->lb.first = NULL;
-	dlist->lb.last = NULL;
-
-	init_array(&(dlist->da));
-}
-
-/* reinitialize dynamic list with acces array */
-void BLI_dlist_reinit(DynamicList *dlist)
-{
-	if(!dlist) return;
-	
-	BLI_freelistN(&(dlist->lb));
-	reinit_array(&(dlist->da));
-}
-
-/*=====================================================================================*/
-
-char *BLI_strdupn(const char *str, int len) {
-	char *n= MEM_mallocN(len+1, "strdup");
-	memcpy(n, str, len);
-	n[len]= '\0';
-	
-	return n;
-}
-char *BLI_strdup(const char *str) {
-	return BLI_strdupn(str, strlen(str));
-}
-
-char *BLI_strncpy(char *dst, const char *src, int maxncpy) {
-	int srclen= strlen(src);
-	int cpylen= (srclen>(maxncpy-1))?(maxncpy-1):srclen;
-	
-	memcpy(dst, src, cpylen);
-	dst[cpylen]= '\0';
-	
-	return dst;
-}
-
-int BLI_snprintf(char *buffer, size_t count, const char *format, ...)
-{
-	int n;
-	va_list arg;
-
-	va_start(arg, format);
-	n = vsnprintf(buffer, count, format, arg);
-	
-	if (n != -1 && n < count) {
-		buffer[n] = '\0';
-	} else {
-		buffer[count-1] = '\0';
-	}
-	
-	va_end(arg);
-	return n;
-}
-
-int BLI_streq(char *a, char *b) {
-	return (strcmp(a, b)==0);
-}
-int BLI_strcaseeq(char *a, char *b) {
-	return (BLI_strcasecmp(a, b)==0);
-}
-
 /* ******************** string encoding ***************** */
 
 /* This is quite an ugly function... its purpose is to
@@ -1924,6 +1339,27 @@ void BLI_where_is_temp(char *fullname, int usertemp)
 	}
 }
 
+char *get_install_dir(void) {
+	extern char bprogname[];
+	char *tmpname = BLI_strdup(bprogname);
+	char *cut;
+
+#ifdef __APPLE__
+	cut = strstr(tmpname, ".app");
+	if (cut) cut[0] = 0;
+#endif
+
+	cut = BLI_last_slash(tmpname);
+
+	if (cut) {
+		cut[0] = 0;
+		return tmpname;
+	} else {
+		MEM_freeN(tmpname);
+		return NULL;
+	}
+}
+
 /* 
  * returns absolute path to the app bundle
  * only useful on OS X 
@@ -1942,65 +1378,7 @@ char* BLI_getbundle(void) {
 }
 #endif
 
-/* strcasestr not available in MSVC */
-char *BLI_strcasestr(const char *s, const char *find)
-{
-    register char c, sc;
-    register size_t len;
-	
-    if ((c = *find++) != 0) {
-		c= tolower(c);
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-				sc= tolower(sc);
-			} while (sc != c);
-		} while (BLI_strncasecmp(s, find, len) != 0);
-		s--;
-    }
-    return ((char *) s);
-}
-
-
-int BLI_strcasecmp(const char *s1, const char *s2) {
-	int i;
-
-	for (i=0; ; i++) {
-		char c1 = tolower(s1[i]);
-		char c2 = tolower(s2[i]);
-
-		if (c1<c2) {
-			return -1;
-		} else if (c1>c2) {
-			return 1;
-		} else if (c1==0) {
-			break;
-		}
-	}
-
-	return 0;
-}
 
-int BLI_strncasecmp(const char *s1, const char *s2, int n) {
-	int i;
-
-	for (i=0; i<n; i++) {
-		char c1 = tolower(s1[i]);
-		char c2 = tolower(s2[i]);
-
-		if (c1<c2) {
-			return -1;
-		} else if (c1>c2) {
-			return 1;
-		} else if (c1==0) {
-			break;
-		}
-	}
-
-	return 0;
-}
 
 
 #ifdef WITH_ICONV
@@ -2034,68 +1412,4 @@ void BLI_string_to_utf8(char *original, char *utf_8, const char *code)
 }
 #endif // WITH_ICONV
 
-void BLI_timestr(double _time, char *str)
-{
-	/* format 00:00:00.00 (hr:min:sec) string has to be 12 long */
-	int  hr= ( (int)  _time) / (60*60);
-	int min= (((int)  _time) / 60 ) % 60;
-	int sec= ( (int) (_time)) % 60;
-	int hun= ( (int) (_time   * 100.0)) % 100;
-	
-	if (hr) {
-		sprintf(str, "%.2d:%.2d:%.2d.%.2d",hr,min,sec,hun);
-	} else {
-		sprintf(str, "%.2d:%.2d.%.2d",min,sec,hun);
-	}
-	
-	str[11]=0;
-}
-
-/* ************** 64 bits magic, trick to support up to 32 gig of address space *************** */
-/*                only works for malloced pointers (8 aligned)                   */
-
-#ifdef __LP64__ 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#define PMASK		0x07FFFFFFFFi64
-#else
-#define PMASK		0x07FFFFFFFFll
-#endif
-
-
-int BLI_int_from_pointer(void *poin)
-{
-	intptr_t lval= (intptr_t)poin;
-	
-	return (int)(lval>>3);
-}
-
-void *BLI_pointer_from_int(int val)
-{
-	static int firsttime= 1;
-	static intptr_t basevalue= 0;
-	
-	if(firsttime) {
-		void *poin= malloc(10000);
-		basevalue= (intptr_t)poin;
-		basevalue &= ~PMASK;
-		printf("base: %d pointer %p\n", basevalue, poin); /* debug */
-		firsttime= 0;
-		free(poin);
-	}
-	return (void *)(basevalue | (((intptr_t)val)<<3));
-}
-
-#else
-
-int BLI_int_from_pointer(void *poin)
-{
-	return (int)poin;
-}
-void *BLI_pointer_from_int(int val)
-{
-	return (void *)val;
-}
-
-#endif