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

Merge branch 'th/gdataset-cleanup' into 'main'

Browse Source 
[th/gdataset-cleanup] minor cleanups of gdataset

See merge request GNOME/glib!4520
This commit is contained in:
Philip Withnall 2025-04-03 15:25:20 +00:00
commit c4af0f0bd0
1 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
glib/gdataset.c
View File

@ -636,7 +636,7 @@ g_data_set_internal (GData **datalist,
if (dataset && !d)
g_dataset_destroy_internal (dataset);
if (d_to_free)
if (G_UNLIKELY (d_to_free))
g_free (d_to_free);
}
else
@ -782,7 +782,7 @@ g_datalist_id_remove_multiple (GData **datalist,
if (found_keys > 0 && datalist_shrink (&d, &d_to_free))
{
g_datalist_unlock_and_set (datalist, d);
if (d_to_free)
if (G_UNLIKELY (d_to_free))
g_free (d_to_free);
}
else
@ -1097,7 +1097,6 @@ g_datalist_id_update_atomic (GData **datalist,
gpointer result;
GDestroyNotify new_destroy;
guint32 idx;
gboolean to_unlock = TRUE;
d = g_datalist_lock_and_get (datalist);
@ -1116,49 +1115,59 @@ g_datalist_id_update_atomic (GData **datalist,
result = callback (&new_data, &new_destroy, user_data);
if (data && !new_data)
if (G_LIKELY (data))
{
GData *d_to_free;
/* Remove. The callback indicates to drop the entry.
*
* The old data->data was stolen by callback(). */
datalist_remove (d, idx);
if (datalist_shrink (&d, &d_to_free))
if (G_LIKELY (data->data == new_data && data->destroy == new_destroy))
{
g_datalist_unlock_and_set (datalist, d);
if (d_to_free)
g_free (d_to_free);
to_unlock = FALSE;
/* No change. */
}
else if (!new_data)
{
GData *d_to_free;
/* Remove. The callback indicates to drop the entry.
*
* The old data->data was stolen by callback(). */
datalist_remove (d, idx);
if (datalist_shrink (&d, &d_to_free))
{
g_datalist_unlock_and_set (datalist, d);
if (G_UNLIKELY (d_to_free))
g_free (d_to_free);
goto return_without_unlock;
}
}
else
{
/* Update. The callback may have provided new pointers to an existing
* entry.
*
* The old data was stolen by callback(). We only update the pointers and
* are done. */
data->data = new_data;
data->destroy = new_destroy;
}
}
else if (data)
{
/* Update. The callback may have provided new pointers to an existing
* entry.
*
* The old data was stolen by callback(). We only update the pointers and
* are done. */
data->data = new_data;
data->destroy = new_destroy;
}
else if (!data && !new_data)
{
/* Absent. No change. The entry didn't exist and still does not. */
}
else
{
/* Add. Add a new entry that didn't exist previously. */
if (datalist_append (&d, key_id, new_data, new_destroy))
if (G_LIKELY (!new_data))
{
g_datalist_unlock_and_set (datalist, d);
to_unlock = FALSE;
/* No change. The entry didn't exist and still does not. */
}
else
{
/* Add. Add a new entry that didn't exist previously. */
if (datalist_append (&d, key_id, new_data, new_destroy))
{
g_datalist_unlock_and_set (datalist, d);
goto return_without_unlock;
}
}
}
if (to_unlock)
g_datalist_unlock (datalist);
g_datalist_unlock (datalist);
return_without_unlock:
return result;
}
@ -1362,12 +1371,12 @@ g_datalist_id_replace_data (GData **datalist,
}
}
}
if (val == NULL && oldval == NULL && newval != NULL)
else
{
if (datalist_append (&d, key_id, newval, destroy))
if (oldval == NULL && newval != NULL)
{
set_d = TRUE;
if (datalist_append (&d, key_id, newval, destroy))
set_d = TRUE;
}
}
@ -1376,7 +1385,7 @@ g_datalist_id_replace_data (GData **datalist,
else
g_datalist_unlock (datalist);
if (d_to_free)
if (G_UNLIKELY (d_to_free))
g_free (d_to_free);
return val == oldval;