From 6c4580c9c778efca1d802ef77142c9faba634ccf Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Mon, 19 May 2003 17:02:32 +0000 Subject: [PATCH] Remove unused function g_list_sort2 (bug #113203). 2003-05-19 Noah Levitt * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/glist.c | 59 ---------------------------------------------- 7 files changed, 24 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index a44d97f07..9c15affdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-05-19 Noah Levitt + + * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). + 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a44d97f07..9c15affdc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2003-05-19 Noah Levitt + + * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). + 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a44d97f07..9c15affdc 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2003-05-19 Noah Levitt + + * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). + 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a44d97f07..9c15affdc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2003-05-19 Noah Levitt + + * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). + 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a44d97f07..9c15affdc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2003-05-19 Noah Levitt + + * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). + 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a44d97f07..9c15affdc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2003-05-19 Noah Levitt + + * glib/glist.c: Remove unused function g_list_sort2 (bug #113203). + 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in diff --git a/glib/glist.c b/glib/glist.c index 983851909..842167bc3 100644 --- a/glib/glist.c +++ b/glib/glist.c @@ -813,62 +813,3 @@ g_list_sort_with_data (GList *list, return g_list_sort_real (list, (GFunc) compare_func, TRUE, user_data); } -static GList* -g_list_sort2 (GList *list, - GCompareFunc compare_func) -{ - GSList *runs = NULL; - GList *tmp; - - /* Degenerate case. */ - if (!list) return NULL; - - /* Assume: list = [12,2,4,11,2,4,6,1,1,12]. */ - for (tmp = list; tmp; ) - { - GList *tmp2; - for (tmp2 = tmp; - tmp2->next && compare_func (tmp2->data, tmp2->next->data) <= 0; - tmp2 = tmp2->next) - /* Nothing */; - runs = g_slist_append (runs, tmp); - tmp = tmp2->next; - tmp2->next = NULL; - } - /* Now: runs = [[12],[2,4,11],[2,4,6],[1,1,12]]. */ - - while (runs->next) - { - /* We have more than one run. Merge pairwise. */ - GSList *dst, *src, *dstprev = NULL; - dst = src = runs; - while (src && src->next) - { - dst->data = g_list_sort_merge (src->data, - src->next->data, - (GFunc) compare_func, - FALSE, NULL); - dstprev = dst; - dst = dst->next; - src = src->next->next; - } - - /* If number of runs was odd, just keep the last. */ - if (src) - { - dst->data = src->data; - dstprev = dst; - dst = dst->next; - } - - dstprev->next = NULL; - g_slist_free (dst); - } - - /* After 1st loop: runs = [[2,4,11,12],[1,1,2,4,6,12]]. */ - /* After 2nd loop: runs = [[1,1,2,2,4,4,6,11,12,12]]. */ - - list = runs->data; - g_slist_free (runs); - return list; -}