luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdataset: simplify g_dataset_destroy_internal()

Browse Source
This commit is contained in:
Thomas Haller 2024-01-04 17:32:35 +01:00
parent e931162348
commit 3f34a49ee9
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glib/gdataset.c
View File

@ -213,7 +213,9 @@ g_dataset_destroy_internal (GDataset *dataset)
GData *data;
guint i;
if (G_DATALIST_GET_POINTER(&dataset->datalist) == NULL)
data = G_DATALIST_GET_POINTER (&dataset->datalist);
if (!data)
{
if (dataset == g_dataset_cached)
g_dataset_cached = NULL;
@ -222,22 +224,18 @@ g_dataset_destroy_internal (GDataset *dataset)
break;
}
data = G_DATALIST_GET_POINTER (&dataset->datalist);
G_DATALIST_SET_POINTER (&dataset->datalist, NULL);
if (data)
G_UNLOCK (g_dataset_global);
for (i = 0; i < data->len; i++)
{
G_UNLOCK (g_dataset_global);
for (i = 0; i < data->len; i++)
{
if (data->data[i].data && data->data[i].destroy)
data->data[i].destroy (data->data[i].data);
}
G_LOCK (g_dataset_global);
g_free (data);
if (data->data[i].data && data->data[i].destroy)
data->data[i].destroy (data->data[i].data);
}
g_free (data);
G_LOCK (g_dataset_global);
dataset = g_dataset_lookup (dataset_location);
}
}