* Copyright (C) 1998 Tim Janik
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
/*
- * Modified by the GLib Team and others 1997-1999. See the AUTHORS
+ * Modified by the GLib Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GLib Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GLib at ftp://ftp.gtk.org/pub/gtk/.
static inline GDataset* g_dataset_lookup (gconstpointer dataset_location);
static inline void g_datalist_clear_i (GData **datalist);
static void g_dataset_destroy_internal (GDataset *dataset);
-static inline void g_data_set_internal (GData **datalist,
+static inline gpointer g_data_set_internal (GData **datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func,
list = prev->next;
if (prev->destroy_func)
- prev->destroy_func (prev->data);
+ {
+ G_UNLOCK (g_dataset_global);
+ prev->destroy_func (prev->data);
+ G_LOCK (g_dataset_global);
+ }
if (g_data_cache_length < G_DATA_CACHE_MAX)
{
}
/* HOLDS: g_dataset_global_lock */
-static inline void
+static inline gpointer
g_data_set_internal (GData **datalist,
GQuark key_id,
gpointer data,
{
if (list->id == key_id)
{
+ gpointer ret_data = NULL;
+
if (prev)
prev->next = list->next;
else
* data without destroy notification
*/
if (list->destroy_func && !destroy_func)
- list->destroy_func (list->data);
+ {
+ G_UNLOCK (g_dataset_global);
+ list->destroy_func (list->data);
+ G_LOCK (g_dataset_global);
+ }
+ else
+ ret_data = list->data;
if (g_data_cache_length < G_DATA_CACHE_MAX)
{
else
g_mem_chunk_free (g_data_mem_chunk, list);
- return;
+ return ret_data;
}
prev = list;
/* we need to have updated all structures prior to
* invokation of the destroy function
*/
+ G_UNLOCK (g_dataset_global);
dfunc (ddata);
+ G_LOCK (g_dataset_global);
}
- return;
+ return NULL;
}
list = list->next;
list->destroy_func = destroy_func;
*datalist = list;
}
+
+ return NULL;
}
void
G_UNLOCK (g_dataset_global);
}
-void
+gpointer
g_dataset_id_remove_no_notify (gconstpointer dataset_location,
GQuark key_id)
{
- g_return_if_fail (dataset_location != NULL);
+ gpointer ret_data = NULL;
+
+ g_return_val_if_fail (dataset_location != NULL, NULL);
G_LOCK (g_dataset_global);
if (key_id && g_dataset_location_ht)
dataset = g_dataset_lookup (dataset_location);
if (dataset)
- g_data_set_internal (&dataset->datalist, key_id, NULL, (GDestroyNotify) 42, dataset);
+ ret_data = g_data_set_internal (&dataset->datalist, key_id, NULL, (GDestroyNotify) 42, dataset);
}
G_UNLOCK (g_dataset_global);
+
+ return ret_data;
}
-void
+gpointer
g_datalist_id_remove_no_notify (GData **datalist,
GQuark key_id)
{
- g_return_if_fail (datalist != NULL);
+ gpointer ret_data = NULL;
+
+ g_return_val_if_fail (datalist != NULL, NULL);
G_LOCK (g_dataset_global);
if (key_id && g_dataset_location_ht)
- g_data_set_internal (datalist, key_id, NULL, (GDestroyNotify) 42, NULL);
+ ret_data = g_data_set_internal (datalist, key_id, NULL, (GDestroyNotify) 42, NULL);
G_UNLOCK (g_dataset_global);
+
+ return ret_data;
}
gpointer