Move to corresponding subdirectories.

[platform/upstream/glib.git] / gdataset.c

diff --git a/gdataset.c b/gdataset.c
index 5f85359..e953016 100644 (file)
--- a/gdataset.c
+++ b/gdataset.c
@@ -19,6 +19,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+/*
+ * Modified by the GLib Team and others 1997-1999.  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/. 
+ */
+
 /* 
  * MT safe ; FIXME: might still freeze, watch out, not thoroughly
  * looked at yet.  
@@ -57,7 +64,7 @@ struct _GDataset
 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,
@@ -103,7 +110,11 @@ g_datalist_clear_i (GData **datalist)
       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)
        {
@@ -187,7 +198,7 @@ g_dataset_destroy (gconstpointer  dataset_location)
 }
 
 /* HOLDS: g_dataset_global_lock */
-static inline void
+static inline gpointer
 g_data_set_internal (GData       **datalist,
                     GQuark         key_id,
                     gpointer       data,
@@ -206,6 +217,8 @@ g_data_set_internal (GData    **datalist,
        {
          if (list->id == key_id)
            {
+             gpointer ret_data = NULL;
+
              if (prev)
                prev->next = list->next;
              else
@@ -226,7 +239,13 @@ g_data_set_internal (GData   **datalist,
               * 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)
                {
@@ -237,7 +256,7 @@ g_data_set_internal (GData    **datalist,
              else
                g_mem_chunk_free (g_data_mem_chunk, list);
              
-             return;
+             return ret_data;
            }
          
          prev = list;
@@ -268,10 +287,12 @@ g_data_set_internal (GData          **datalist,
                  /* 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;
@@ -291,6 +312,8 @@ g_data_set_internal (GData    **datalist,
       list->destroy_func = destroy_func;
       *datalist = list;
     }
+
+  return NULL;
 }
 
 void
@@ -356,11 +379,13 @@ g_datalist_id_set_data_full (GData          **datalist,
   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)
@@ -369,21 +394,27 @@ g_dataset_id_remove_no_notify (gconstpointer  dataset_location,
   
       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