[Simplemail-cvs] simplemail index_external.c,1.44,1.45

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24959

Modified Files:
	index_external.c 
Log Message:
Extracted median + 1 into an own variable.


Index: index_external.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/index_external.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- index_external.c	19 Jan 2014 18:50:51 -0000	1.44
+++ index_external.c	19 Jan 2014 18:51:10 -0000	1.45
@@ -609,6 +609,7 @@
 			 */
 
 			int median = tmp->num_elements / 2;
+			int start_of_2nd_node = median + 1;
 			struct bnode_element *me = bnode_get_ith_element_of_node(idx, tmp, median);
 			struct bnode_element me_copy = *me;
 
@@ -616,10 +617,10 @@
 			tmp->num_elements = median;
 
 			/* Second node */
-			idx->tmp3->num_elements = idx->max_elements_per_node - (median + 1);
+			idx->tmp3->num_elements = idx->max_elements_per_node - start_of_2nd_node;
 			idx->tmp3->lchild = me->gchild;
 			idx->tmp3->leaf = tmp->leaf;
-			memcpy(bnode_get_ith_element_of_node(idx, idx->tmp3, 0), bnode_get_ith_element_of_node(idx, tmp, median + 1), idx->tmp3->num_elements * sizeof(struct bnode_element));
+			memcpy(bnode_get_ith_element_of_node(idx, idx->tmp3, 0), bnode_get_ith_element_of_node(idx, tmp, start_of_2nd_node), idx->tmp3->num_elements * sizeof(struct bnode_element));
 			bnode_clear_elements(idx, idx->tmp3, idx->tmp3->num_elements);
 			int tmp3block = bnode_add_block(idx, idx->tmp3);