1 files changed, 14 insertions, 20 deletions

diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c
index 3aa4f9bc..69ea469a 100644
--- a/lib/libalpm/alpm_list.c
+++ b/lib/libalpm/alpm_list.c
@@ -204,7 +204,8 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
  *
  * @return the resultant list
  */
-alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn)
+alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right,
+		alpm_list_fn_cmp fn)
 {
 	alpm_list_t *newlist, *lp, *tail_ptr, *left_tail_ptr, *right_tail_ptr;
 
@@ -273,20 +274,26 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a
  *
  * @return the resultant list
  */
-alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn)
+alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n,
+		alpm_list_fn_cmp fn)
 {
 	if(n > 1) {
-		alpm_list_t *left = list;
-		alpm_list_t *lastleft = alpm_list_nth(list, n/2 - 1);
-		alpm_list_t *right = lastleft->next;
+		size_t half = n / 2;
+		size_t i = half - 1;
+		alpm_list_t *left = list, *lastleft = list, *right;
+
+		while(i--) {
+			lastleft = lastleft->next;
+		}
+		right = lastleft->next;
 
 		/* tidy new lists */
 		lastleft->next = NULL;
 		right->prev = left->prev;
 		left->prev = lastleft;
 
-		left = alpm_list_msort(left, n/2, fn);
-		right = alpm_list_msort(right, n - (n/2), fn);
+		left = alpm_list_msort(left, half, fn);
+		right = alpm_list_msort(right, n - half, fn);
 		list = alpm_list_mmerge(left, right, fn);
 	}
 	return list;
@@ -579,19 +586,6 @@ alpm_list_t SYMEXPORT *alpm_list_last(const alpm_list_t *list)
 	}
 }
 
-/**
- * @brief Get the data member of a list node.
- *
- * @param node the list node
- *
- * @return the contained data, or NULL if none
- */
-void SYMEXPORT *alpm_list_getdata(const alpm_list_t *node)
-{
-	if(node == NULL) return NULL;
-	return node->data;
-}
-
 /* Misc */
 
 /**