rename addlisttolist() to BLI_movelisttolist()

name was misleading because the list items were removed from the source list.
(no functional changes)

2 files changed, 32 insertions, 32 deletions

diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c
index 776f2d085df..b8b0b5b6eda 100644
--- a/source/blender/blenlib/intern/listbase.c
+++ b/source/blender/blenlib/intern/listbase.c
@@ -46,20 +46,20 @@
 /* implementation */
 
 /* Ripped this from blender.c */
-void addlisttolist(ListBase *list1, ListBase *list2)
+void BLI_movelisttolist(ListBase *dst, ListBase *src)
 {
-	if (list2->first==0) return;
+	if (src->first==0) return;
 
-	if (list1->first==0) {
-		list1->first= list2->first;
-		list1->last= list2->last;
+	if (dst->first==0) {
+		dst->first= src->first;
+		dst->last= src->last;
 	}
 	else {
-		((Link *)list1->last)->next= list2->first;
-		((Link *)list2->first)->prev= list1->last;
-		list1->last= list2->last;
+		((Link *)dst->last)->next= src->first;
+		((Link *)src->first)->prev= dst->last;
+		dst->last= src->last;
 	}
-	list2->first= list2->last= 0;
+	src->first= src->last= 0;
 }
 
 void BLI_addhead(ListBase *listbase, void *vlink)
@@ -304,7 +304,7 @@ void BLI_freelistN(ListBase *listbase)
 }
 
 
-int BLI_countlist(ListBase *listbase)
+int BLI_countlist(const ListBase *listbase)
 {
 	Link *link;
 	int count = 0;
@@ -319,7 +319,7 @@ int BLI_countlist(ListBase *listbase)
 	return count;
 }
 
-void *BLI_findlink(ListBase *listbase, int number)
+void *BLI_findlink(const ListBase *listbase, int number)
 {
 	Link *link = NULL;
 
@@ -334,7 +334,7 @@ void *BLI_findlink(ListBase *listbase, int number)
 	return link;
 }
 
-int BLI_findindex(ListBase *listbase, void *vlink)
+int BLI_findindex(const ListBase *listbase, void *vlink)
 {
 	Link *link= NULL;
 	int number= 0;
@@ -354,7 +354,7 @@ int BLI_findindex(ListBase *listbase, void *vlink)
 	return -1;
 }
 
-void *BLI_findstring(ListBase *listbase, const char *id, int offset)
+void *BLI_findstring(const ListBase *listbase, const char *id, const int offset)
 {
 	Link *link= NULL;
 	const char *id_iter;
@@ -374,7 +374,7 @@ void *BLI_findstring(ListBase *listbase, const char *id, int offset)
 	return NULL;
 }
 
-void *BLI_findstring_ptr(ListBase *listbase, const char *id, int offset)
+void *BLI_findstring_ptr(const ListBase *listbase, const char *id, const int offset)
 {
 	Link *link= NULL;
 	const char *id_iter;
@@ -395,7 +395,7 @@ void *BLI_findstring_ptr(ListBase *listbase, const char *id, int offset)
 	return NULL;
 }
 
-int BLI_findstringindex(ListBase *listbase, const char *id, int offset)
+int BLI_findstringindex(const ListBase *listbase, const char *id, const int offset)
 {
 	Link *link= NULL;
 	const char *id_iter;
@@ -416,20 +416,20 @@ int BLI_findstringindex(ListBase *listbase, const char *id, int offset)
 	return -1;
 }
 
-void BLI_duplicatelist(ListBase *list1, const ListBase *list2)
+void BLI_duplicatelist(ListBase *dst, const ListBase *src)
 {
-	struct Link *link1, *link2;
-	
-	/* in this order, to ensure it works if list1 == list2 */
-	link2= list2->first;
-	list1->first= list1->last= 0;
-	
-	while(link2) {
-		link1= MEM_dupallocN(link2);
-		BLI_addtail(list1, link1);
-		
-		link2= link2->next;
-	}	
+	struct Link *dst_link, *src_link;
+
+	/* in this order, to ensure it works if dst == src */
+	src_link= src->first;
+	dst->first= dst->last= 0;
+
+	while(src_link) {
+		dst_link= MEM_dupallocN(src_link);
+		BLI_addtail(dst, dst_link);
+
+		src_link= src_link->next;
+	}
 }
 
 /* create a generic list node containing link to provided data */
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c
index 85412e28c4f..86167078094 100644
--- a/source/blender/blenlib/intern/scanfill.c
+++ b/source/blender/blenlib/intern/scanfill.c
@@ -465,8 +465,8 @@ static void splitlist(ListBase *tempve, ListBase *temped, short nr)
 	EditVert *eve,*nextve;
 	EditEdge *eed,*nexted;
 
-	addlisttolist(tempve,&fillvertbase);
-	addlisttolist(temped,&filledgebase);
+	BLI_movelisttolist(tempve,&fillvertbase);
+	BLI_movelisttolist(temped,&filledgebase);
 
 	eve= tempve->first;
 	while(eve) {
@@ -1029,8 +1029,8 @@ int BLI_edgefill(int mat_nr)
 		}
 		pf++;
 	}
-	addlisttolist(&fillvertbase,&tempve);
-	addlisttolist(&filledgebase,&temped);
+	BLI_movelisttolist(&fillvertbase,&tempve);
+	BLI_movelisttolist(&filledgebase,&temped);
 
 	/* FREE */