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

Merge branch 'wsign-conversion' into 'main'

Browse Source 
gqsort: Add g_sort_array() and deprecate g_qsort_with_data()

See merge request GNOME/glib!4127
This commit is contained in:
Philip Withnall
2024-07-04 12:33:38 +00:00
parent 22d699943d f953212cc5
commit 70784b99b1
6 changed files with 146 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/gvaluearray.c
View File

@@ -364,9 +364,9 @@ g_value_array_sort_with_data (GValueArray *value_array,
g_return_val_if_fail (compare_func != NULL, NULL);
if (value_array->n_values)
g_qsort_with_data (value_array->values,
value_array->n_values,
sizeof (value_array->values[0]),
compare_func, user_data);
g_sort_array (value_array->values,
value_array->n_values,
sizeof (value_array->values[0]),
compare_func, user_data);
return value_array;
}

47
gobject/tests/value.c
View File

@@ -664,6 +664,52 @@ test_valuearray_basic (void)
g_value_array_free (a2);
}
static gint
cmpint_with_data (gconstpointer a,
gconstpointer b,
gpointer user_data)
{
const GValue *aa = a;
const GValue *bb = b;
g_assert_cmpuint (GPOINTER_TO_UINT (user_data), ==, 123);
return g_value_get_int (aa) - g_value_get_int (bb);
}
static void
test_value_array_sort_with_data (void)
{
GValueArray *a, *a2;
GValue v = G_VALUE_INIT;
a = g_value_array_new (20);
/* Try sorting an empty array. */
a2 = g_value_array_sort_with_data (a, cmpint_with_data, GUINT_TO_POINTER (456));
g_assert_cmpuint (a->n_values, ==, 0);
g_assert_true (a2 == a);
/* Add some values and try sorting them. */
g_value_init (&v, G_TYPE_INT);
for (unsigned int i = 0; i < 100; i++)
{
g_value_set_int (&v, 100 - i);
g_value_array_append (a, &v);
}
g_assert_cmpint (a->n_values, ==, 100);
a2 = g_value_array_sort_with_data (a, cmpint_with_data, GUINT_TO_POINTER (123));
for (unsigned int i = 0; i < a->n_values - 1; i++)
g_assert_cmpint (g_value_get_int (&a->values[i]), <=, g_value_get_int (&a->values[i+1]));
g_assert_true (a2 == a);
g_value_array_free (a);
}
/* We create some dummy objects with this relationship:
*
* GObject TestInterface
@@ -765,6 +811,7 @@ main (int argc, char *argv[])
g_test_add_func ("/value/basic", test_value_basic);
g_test_add_func ("/value/array/basic", test_valuearray_basic);
g_test_add_func ("/value/array/sort-with-data", test_value_array_sort_with_data);
g_test_add_func ("/value/collection", test_collection);
g_test_add_func ("/value/copying", test_copying);
g_test_add_func ("/value/enum-transformation", test_enum_transformation);