diff options
Diffstat (limited to '0001-Revert-list-store-Fix-a-parameter-check.patch')
-rw-r--r-- | 0001-Revert-list-store-Fix-a-parameter-check.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/0001-Revert-list-store-Fix-a-parameter-check.patch b/0001-Revert-list-store-Fix-a-parameter-check.patch deleted file mode 100644 index 397ff93df0a8..000000000000 --- a/0001-Revert-list-store-Fix-a-parameter-check.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 19a560f9491c4964e7093e22cb3876fc53a442e6 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Wed, 23 Sep 2015 23:16:04 +0200 -Subject: [PATCH] Revert "list store: Fix a parameter check" - -This reverts commit d28639507db2029b8f184a5d93e9d8c28acc1955. - -Bogus commit changing the behavior of g_sequence_search in violation -of the documentation. Breaks GStreamer test suite. ---- - glib/gsequence.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/glib/gsequence.c b/glib/gsequence.c -index 75c1f76..76e24e7 100644 ---- a/glib/gsequence.c -+++ b/glib/gsequence.c -@@ -139,8 +139,7 @@ static GSequenceNode *node_find_closest (GSequenceNode *haystack, - GSequenceNode *needle, - GSequenceNode *end, - GSequenceIterCompareFunc cmp, -- gpointer user_data, -- gboolean return_match); -+ gpointer user_data); - static gint node_get_length (GSequenceNode *node); - static void node_free (GSequenceNode *node, - GSequence *seq); -@@ -1080,7 +1079,7 @@ g_sequence_search_iter (GSequence *seq, - dummy = g_sequence_append (tmp_seq, data); - - node = node_find_closest (seq->end_node, dummy, -- seq->end_node, iter_cmp, cmp_data, TRUE); -+ seq->end_node, iter_cmp, cmp_data); - - g_sequence_free (tmp_seq); - -@@ -1734,8 +1733,7 @@ node_find_closest (GSequenceNode *haystack, - GSequenceNode *needle, - GSequenceNode *end, - GSequenceIterCompareFunc iter_cmp, -- gpointer cmp_data, -- gboolean return_match) -+ gpointer cmp_data) - { - GSequenceNode *best; - gint c; -@@ -1765,12 +1763,10 @@ node_find_closest (GSequenceNode *haystack, - } - while (haystack != NULL); - -- /* If the best node is smaller than the data, then move one step -- * to the right to make sure the best one is strictly bigger than the data. -- * We do return the last exact match or the node after it, depending on -- * the return_match argument. -+ /* If the best node is smaller or equal to the data, then move one step -+ * to the right to make sure the best one is strictly bigger than the data - */ -- if (best != end && (c < 0 || (c == 0 && !return_match))) -+ if (best != end && c <= 0) - best = node_get_next (best); - - return best; -@@ -1992,7 +1988,7 @@ node_insert_sorted (GSequenceNode *node, - { - GSequenceNode *closest; - -- closest = node_find_closest (node, new, end, iter_cmp, cmp_data, FALSE); -+ closest = node_find_closest (node, new, end, iter_cmp, cmp_data); - - node_unlink (new); - --- -2.5.3 - |