[Bf-blender-cvs] [44633c6] particles_refactor: Cleanup: use blenlib prefixes for iterator functions too.

[Lukas Tönne]

Commit: 44633c67d16e20e3d6c8cfa1ea46667ff83ad449
Author: Lukas Tönne
Date:   Thu May 23 11:31:05 2013 +0200
https://developer.blender.org/rB44633c67d16e20e3d6c8cfa1ea46667ff83ad449

Cleanup: use blenlib prefixes for iterator functions too.

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

M	source/blender/blenlib/BLI_pagedbuffer.h
M	source/blender/blenlib/intern/pagedbuffer.c

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

diff --git a/source/blender/blenlib/BLI_pagedbuffer.h b/source/blender/blenlib/BLI_pagedbuffer.h
index e9a96f6..b29d501 100644
--- a/source/blender/blenlib/BLI_pagedbuffer.h
+++ b/source/blender/blenlib/BLI_pagedbuffer.h
@@ -110,15 +110,15 @@ void BLI_pbuf_compress(struct bPagedBuffer *pbuf, bPagedBufferTestFunc removetes
 }
 
 /* XXX these could be inlined for performance */
-struct bPagedBufferIterator pit_init(struct bPagedBuffer *pbuf);
-struct bPagedBufferIterator pit_init_at(struct bPagedBuffer *pbuf, int index);
-void pit_next(struct bPagedBufferIterator *it);
-void pit_prev(struct bPagedBufferIterator *it);
-void pit_forward(struct bPagedBufferIterator *it, int delta);
-void pit_backward(struct bPagedBufferIterator *it, int delta);
-void pit_forward_to(struct bPagedBufferIterator *it, int index);
-void pit_backward_to(struct bPagedBufferIterator *it, int index);
-void pit_goto(struct bPagedBufferIterator *it, int index);
+struct bPagedBufferIterator BLI_pbuf_iter_init(struct bPagedBuffer *pbuf);
+struct bPagedBufferIterator BLI_pbuf_iter_init_at(struct bPagedBuffer *pbuf, int index);
+void BLI_pbuf_iter_next(struct bPagedBufferIterator *it);
+void BLI_pbuf_iter_prev(struct bPagedBufferIterator *it);
+void BLI_pbuf_iter_forward(struct bPagedBufferIterator *it, int delta);
+void BLI_pbuf_iter_backward(struct bPagedBufferIterator *it, int delta);
+void BLI_pbuf_iter_forward_to(struct bPagedBufferIterator *it, int index);
+void BLI_pbuf_iter_backward_to(struct bPagedBufferIterator *it, int index);
+void BLI_pbuf_iter_goto(struct bPagedBufferIterator *it, int index);
 
 #define PBUF_ITER_GET_POINTER(result, iter, layer, datatype) \
 	PBUF_GET_DATA_POINTER(result, iter.page, layer, datatype, iter.page_index)
diff --git a/source/blender/blenlib/intern/pagedbuffer.c b/source/blender/blenlib/intern/pagedbuffer.c
index 791d834..0335017 100644
--- a/source/blender/blenlib/intern/pagedbuffer.c
+++ b/source/blender/blenlib/intern/pagedbuffer.c
@@ -430,7 +430,7 @@ bPagedBufferIterator BLI_pbuf_set_elements(bPagedBuffer *pbuf, int totelem)
 	update_totalloc(pbuf);
 	
 	/* full buffer iterator */
-	return pit_init(pbuf);
+	return BLI_pbuf_iter_init(pbuf);
 }
 
 bPagedBufferIterator BLI_pbuf_append_elements(bPagedBuffer *pbuf, int totappend)
@@ -464,7 +464,7 @@ bPagedBufferIterator BLI_pbuf_append_elements(bPagedBuffer *pbuf, int totappend)
 	update_totalloc(pbuf);
 	
 	/* iterator over new elements */
-	return pit_init_at(pbuf, old_totelem);
+	return BLI_pbuf_iter_init_at(pbuf, old_totelem);
 }
 
 void BLI_pbuf_reset(bPagedBuffer *pbuf)
@@ -606,7 +606,7 @@ void BLI_pbuf_compress(struct bPagedBuffer *pbuf, bPagedBufferTestFunc removetes
 
 /**** Iterator ****/
 
-bPagedBufferIterator pit_init(bPagedBuffer *pbuf)
+bPagedBufferIterator BLI_pbuf_iter_init(bPagedBuffer *pbuf)
 {
 	bPagedBufferIterator it;
 	it.page_size = pbuf->page_size;
@@ -633,7 +633,7 @@ bPagedBufferIterator pit_init(bPagedBuffer *pbuf)
 	return it;
 }
 
-bPagedBufferIterator pit_init_at(bPagedBuffer *pbuf, int index)
+bPagedBufferIterator BLI_pbuf_iter_init_at(bPagedBuffer *pbuf, int index)
 {
 	bPagedBufferIterator it;
 	it.page_size = pbuf->page_size;
@@ -653,7 +653,7 @@ bPagedBufferIterator pit_init_at(bPagedBuffer *pbuf, int index)
 	return it;
 }
 
-void pit_next(bPagedBufferIterator *it)
+void BLI_pbuf_iter_next(bPagedBufferIterator *it)
 {
 	/* Note: no it->valid test here, this must be done before advancing! */
 	++it->index;
@@ -677,7 +677,7 @@ void pit_next(bPagedBufferIterator *it)
 	}
 }
 
-void pit_prev(bPagedBufferIterator *it)
+void BLI_pbuf_iter_prev(bPagedBufferIterator *it)
 {
 	/* Note: no it->valid test here, this must be done before advancing! */
 	--it->index;
@@ -708,7 +708,7 @@ void pit_prev(bPagedBufferIterator *it)
  * are skipped (small delta).
  */
 
-void pit_forward(struct bPagedBufferIterator *it, int delta)
+void BLI_pbuf_iter_forward(struct bPagedBufferIterator *it, int delta)
 {
 	/* NB: no validity testing here for speed! (index < index_end) */
 	
@@ -726,7 +726,7 @@ void pit_forward(struct bPagedBufferIterator *it, int delta)
 	it->index += delta;
 }
 
-void pit_backward(struct bPagedBufferIterator *it, int delta)
+void BLI_pbuf_iter_backward(struct bPagedBufferIterator *it, int delta)
 {
 	/* NB: no validity testing here for speed! (index >= 0) */
 	
@@ -744,7 +744,7 @@ void pit_backward(struct bPagedBufferIterator *it, int delta)
 	it->index -= delta;
 }
 
-void pit_forward_to(struct bPagedBufferIterator *it, int index)
+void BLI_pbuf_iter_forward_to(struct bPagedBufferIterator *it, int index)
 {
 	/* NB: no validity testing here for speed! (index < index_end) */
 	
@@ -763,7 +763,7 @@ void pit_forward_to(struct bPagedBufferIterator *it, int index)
 	it->index = index;
 }
 
-void pit_backward_to(struct bPagedBufferIterator *it, int index)
+void BLI_pbuf_iter_backward_to(struct bPagedBufferIterator *it, int index)
 {
 	/* NB: no validity testing here for speed! (index >= 0) */
 	
@@ -782,12 +782,12 @@ void pit_backward_to(struct bPagedBufferIterator *it, int index)
 	it->index = index;
 }
 
-void pit_goto(struct bPagedBufferIterator *it, int index)
+void BLI_pbuf_iter_goto(struct bPagedBufferIterator *it, int index)
 {
 	if (index > it->index)
-		pit_forward_to(it, index);
+		BLI_pbuf_iter_forward_to(it, index);
 	else if (index < it->index)
-		pit_backward_to(it, index);
+		BLI_pbuf_iter_backward_to(it, index);
 }
 
 /**** Data Access ****/