[Simplemail-cvs] simplemail index_external.c,1.34,1.35

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

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

Modified Files:
	index_external.c 
Log Message:
Refactored the finding of the separation slot into an own function.


Index: index_external.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/index_external.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- index_external.c	19 Jan 2014 18:44:43 -0000	1.34
+++ index_external.c	19 Jan 2014 18:45:06 -0000	1.35
@@ -231,6 +231,45 @@
 	} node[BNODE_PATH_MAX_NODES];
 };
 
+
+
+/**
+ * Find the slot with the separation key for the given text. The slot with
+ * the separation key for a given text is the slot whose value is not
+ * lexicographically smaller than the text but whose left neighbor slot value
+ * is lexicographically smaller than the text.
+ *
+ * @param idx
+ * @param tmp
+ * @param text
+ * @param out_slot
+ * @param out_directmatch
+ * @return
+ */
+static int bnode_find_separation_slot(struct index_external *idx, bnode *tmp, const char *text, int *out_slot, int *out_directmatch)
+{
+	int i;
+
+	*out_directmatch = 0;
+
+	/* Find the appropriate slot. TODO: Use binary search */
+	for (i=0; i < tmp->num_elements; i++)
+	{
+		int cmp;
+		struct bnode_element *e = bnode_get_ith_element_of_node(idx, tmp, i);
+		if (!bnode_compare_string(idx, e, text, &cmp))
+			return 0;
+
+		if (cmp >= 0)
+		{
+			*out_directmatch = cmp == 0;
+			break;
+		}
+	}
+	*out_slot = i;
+	return 1;
+}
+
 /**
  * Lookup the given text.
  *
@@ -254,27 +293,8 @@
 
 		bnode_read_block(idx, tmp, block);
 
-		/* Find the slot with the separation key for the given text. The slot with
-		 * the separation key for a given text is the slot whose value is not
-		 * lexicographically smaller than the text but whose left neighbor slot value
-		 * is lexicographically smaller than the text.
-		 *
-		 * TODO: Use binary search
-		 */
-		for (i=0; i < tmp->num_elements; i++)
-		{
-			int cmp;
-			struct bnode_element *e = bnode_get_ith_element_of_node(idx, tmp, i);
-			if (!bnode_compare_string(idx, e, text, &cmp))
-				return 0;
-
-			/* if str > text then we ascend to lchild (except if we are at a leaf, of course) */
-			if (cmp >= 0)
-			{
-				direct_match = cmp == 0;
-				break;
-			}
-		}
+		if (!bnode_find_separation_slot(idx, tmp, text, &i, &direct_match))
+			return 0;
 
 		if (i == 0) lchild = tmp->lchild;
 		else lchild = bnode_get_ith_element_of_node(idx, tmp, i - 1)->gchild;