luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 05:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

list store: Fix a parameter check

Browse Source 
Getting this wrong causes build failures.

https://bugzilla.gnome.org/show_bug.cgi?id=754582
This commit is contained in:
Matthias Clasen 2015-09-04 13:55:46 -04:00
parent da4927b7fb
commit d28639507d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/gsequence.c
View File

@ -139,7 +139,8 @@ static GSequenceNode *node_find_closest (GSequenceNode *haystack,
GSequenceNode *needle,
GSequenceNode *end,
GSequenceIterCompareFunc cmp,
gpointer user_data);
gpointer user_data,
gboolean return_match);
static gint node_get_length (GSequenceNode *node);
static void node_free (GSequenceNode *node,
GSequence *seq);
@ -1079,7 +1080,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);
seq->end_node, iter_cmp, cmp_data, TRUE);
g_sequence_free (tmp_seq);
@ -1733,7 +1734,8 @@ node_find_closest (GSequenceNode *haystack,
GSequenceNode *needle,
GSequenceNode *end,
GSequenceIterCompareFunc iter_cmp,
gpointer cmp_data)
gpointer cmp_data,
gboolean return_match)
{
GSequenceNode *best;
gint c;
@ -1763,10 +1765,12 @@ node_find_closest (GSequenceNode *haystack,
}
while (haystack != NULL);
/* 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 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 (best != end && c <= 0)
if (best != end && (c < 0 || (c == 0 && !return_match)))
best = node_get_next (best);
return best;
@ -1988,7 +1992,7 @@ node_insert_sorted (GSequenceNode *node,
{
GSequenceNode *closest;
closest = node_find_closest (node, new, end, iter_cmp, cmp_data);
closest = node_find_closest (node, new, end, iter_cmp, cmp_data, FALSE);
node_unlink (new);