[Bf-blender-cvs] [bce859c] multiview: cleanup: clarify src/dst listbase copy

[Campbell Barton]

Commit: bce859c805303f6e04c55de0ec9890a943c77a62
Author: Campbell Barton
Date:   Mon Nov 24 10:52:12 2014 +0100
Branches: multiview
https://developer.blender.org/rBbce859c805303f6e04c55de0ec9890a943c77a62

cleanup: clarify src/dst listbase copy

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 46ab4d9..66f55c7 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -407,45 +407,42 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame)
 	}
 }
 
-static void copy_image_packedfiles(ListBase *lbn, ListBase *lbo)
+static void copy_image_packedfiles(ListBase *lb_dst, const ListBase *lb_src)
 {
-	ImagePackedFile *imapf, *imapfn;
-	lbn->first = lbn->last = NULL;
-	imapf = lbo->first;
-	while (imapf) {
-		imapfn = MEM_mallocN(sizeof(ImagePackedFile), "Image Packed Files (copy)");
-		BLI_strncpy(imapfn->filepath, imapf->filepath, sizeof(imapfn->filepath));
+	const ImagePackedFile *imapf_src;
 
-		if (imapf->packedfile)
-			imapfn->packedfile = dupPackedFile(imapf->packedfile);
+	BLI_listbase_clear(lb_dst);
+	for (imapf_src = lb_src->first; imapf_src; imapf_src = imapf_src->next) {
+		ImagePackedFile *imapf_dst = MEM_mallocN(sizeof(ImagePackedFile), "Image Packed Files (copy)");
+		BLI_strncpy(imapf_dst->filepath, imapf_src->filepath, sizeof(imapf_dst->filepath));
 
-		BLI_addtail(lbn, imapfn);
-		imapf = imapf->next;
+		if (imapf_src->packedfile)
+			imapf_dst->packedfile = dupPackedFile(imapf_src->packedfile);
+
+		BLI_addtail(lb_dst, imapf_dst);
 	}
 }
 
-static void copy_image_views(ListBase *lbn, ListBase *lbo)
+static void copy_image_views(ListBase *lb_dst, const ListBase *lb_src)
 {
-	ImageView *iv, *ivn;
-	lbn->first = lbn->last = NULL;
-	iv = lbo->first;
-	while (iv) {
-		ivn = MEM_dupallocN(iv);
-		BLI_addtail(lbn, ivn);
-		iv = iv->next;
+	const ImageView *iv_src;
+
+	BLI_listbase_clear(lb_dst);
+	for (iv_src = lb_src->first; iv_src; iv_src = iv_src->next) {
+		ImageView *iv_dst = MEM_dupallocN(iv_src);
+		BLI_addtail(lb_dst, iv_dst);
 	}
 }
 
-static void copy_image_anims(ListBase *lbn, ListBase *lbo)
+static void copy_image_anims(ListBase *lb_dst, const ListBase *lb_src)
 {
-	ImageAnim *ia, *ian;
-	lbn->first = lbn->last = NULL;
-	ia = lbo->first;
-	while (ia) {
-		ian = MEM_dupallocN(ia);
-		ian->anim = NULL;
-		BLI_addtail(lbn, ian);
-		ia = ia->next;
+	const ImageAnim *ia_src;
+
+	BLI_listbase_clear(lb_dst);
+	for (ia_src = lb_src->first; ia_src; ia_src = ia_src->next) {
+		ImageAnim *ia_dst = MEM_dupallocN(ia_src);
+		ia_dst->anim = NULL;
+		BLI_addtail(lb_dst, ia_dst);
 	}
 }