AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 13:11:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
roaring: Mark a variable as unused

See merge request GNOME/gtk!5990
This commit is contained in:
Matthias Clasen 2023-05-18 13:35:17 +00:00
commit d87b9ee4c5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/roaring/roaring.c
View File

@ -4543,7 +4543,7 @@ void *convert_run_optimize(void *c, uint8_t typecode_original,
int long_ctr = 0; int long_ctr = 0;
uint64_t cur_word = c_qua_bitset->array[0]; uint64_t cur_word = c_qua_bitset->array[0];
int run_count = 0; G_GNUC_UNUSED int run_count = 0;
while (true) { while (true) {
while (cur_word == UINT64_C(0) && while (cur_word == UINT64_C(0) &&
long_ctr < BITSET_CONTAINER_SIZE_IN_WORDS - 1) long_ctr < BITSET_CONTAINER_SIZE_IN_WORDS - 1)

10
testsuite/gtk/treelistmodel.c
View File

@ -550,6 +550,7 @@ test_same_child_model (void)
GtkTreeListModel *treelist; GtkTreeListModel *treelist;
DemoNode *d; DemoNode *d;
guint i, j; guint i, j;
char str[2] = { 0, };
i = N_MODELS; i = N_MODELS;
while (i --> 0) while (i --> 0)
@ -557,7 +558,8 @@ test_same_child_model (void)
models[i] = g_list_store_new (demo_node_get_type ()); models[i] = g_list_store_new (demo_node_get_type ());
for (j = 0; j < N_ITEMS_PER_MODEL; j++) for (j = 0; j < N_ITEMS_PER_MODEL; j++)
{ {
d = demo_node_new ("A" + j, i + 1 < N_MODELS ? models[i + 1] : NULL); str[0] = 'A' + j;
d = demo_node_new (str, i + 1 < N_MODELS ? models[i + 1] : NULL);
g_list_store_append (models[i], d); g_list_store_append (models[i], d);
} }
} }
@ -579,7 +581,8 @@ test_same_child_model (void)
case 0: case 0:
if (n_items < 10) if (n_items < 10)
{ {
d = demo_node_new ("A" + (i % 26), model_id + 1 < N_MODELS ? models[model_id + 1] : NULL); str[0] = 'A' + (i % 26);
d = demo_node_new (str, model_id + 1 < N_MODELS ? models[model_id + 1] : NULL);
g_list_store_insert (model, g_list_store_insert (model,
g_test_rand_int_range (0, n_items + 1), g_test_rand_int_range (0, n_items + 1),
d); d);
@ -591,7 +594,8 @@ test_same_child_model (void)
g_list_store_remove (model, g_test_rand_int_range (0, n_items)); g_list_store_remove (model, g_test_rand_int_range (0, n_items));
break; break;
case 2: case 2:
d = demo_node_new ("A" + (i % 26), model_id + 1 < N_MODELS ? models[model_id + 1] : NULL); str[0] = 'A' + (i % 26);
d = demo_node_new (str, model_id + 1 < N_MODELS ? models[model_id + 1] : NULL);
g_list_store_splice (model, g_list_store_splice (model,
n_items ? g_test_rand_int_range (0, n_items) : 0, n_items ? g_test_rand_int_range (0, n_items) : 0,
n_items ? 1 : 0, n_items ? 1 : 0,