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

Merge branch 'array-test-cheri' into 'main'

Browse Source 
array-test: Don't assume sizeof(void*)==sizeof(gsize)

See merge request GNOME/glib!3827
This commit is contained in:
Marco Trevisan 2024-01-16 02:38:05 +00:00
commit 554eb407de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/tests/array-test.c
View File

@ -2202,7 +2202,7 @@ pointer_array_extend_and_steal (void)
GPtrArray *ptr_array, *ptr_array2, *ptr_array3; GPtrArray *ptr_array, *ptr_array2, *ptr_array3;
gsize i; gsize i;
const gsize array_size = 100; const gsize array_size = 100;
gsize *array_test = g_malloc (array_size * sizeof (gsize)); guintptr *array_test = g_malloc (array_size * sizeof (guintptr));
/* Initializing array_test */ /* Initializing array_test */
for (i = 0; i < array_size; i++) for (i = 0; i < array_size; i++)
@ -2221,7 +2221,7 @@ pointer_array_extend_and_steal (void)
g_ptr_array_extend_and_steal (ptr_array, ptr_array2); g_ptr_array_extend_and_steal (ptr_array, ptr_array2);
for (i = 0; i < array_size; i++) for (i = 0; i < array_size; i++)
g_assert_cmpuint (*((gsize *) g_ptr_array_index (ptr_array, i)), ==, i); g_assert_cmpuint (*((guintptr *) g_ptr_array_index (ptr_array, i)), ==, i);
g_ptr_array_free (ptr_array, TRUE); g_ptr_array_free (ptr_array, TRUE);
@ -2240,7 +2240,7 @@ pointer_array_extend_and_steal (void)
g_ptr_array_extend_and_steal (ptr_array, ptr_array2); g_ptr_array_extend_and_steal (ptr_array, ptr_array2);
for (i = 0; i < array_size; i++) for (i = 0; i < array_size; i++)
g_assert_cmpuint (*((gsize *) g_ptr_array_index (ptr_array, i)), ==, i); g_assert_cmpuint (*((guintptr *) g_ptr_array_index (ptr_array, i)), ==, i);
g_assert_cmpuint (ptr_array3->len, ==, 0); g_assert_cmpuint (ptr_array3->len, ==, 0);
g_assert_null (ptr_array3->pdata); g_assert_null (ptr_array3->pdata);