gdataset: factor out common code for find/append of key

The duplication is cumbersome. Factor out common pieces to finding the
data by key and appending a new data.

glib/gdataset.c

@@ -157,6 +157,66 @@ g_datalist_unlock_and_set (GData **datalist, gpointer ptr)
   g_pointer_bit_unlock_and_set ((void **) datalist, DATALIST_LOCK_BIT, ptr, G_DATALIST_FLAGS_MASK_INTERNAL);
 }
 
+static gboolean
+datalist_append (GData **data, GQuark key_id, gpointer new_data, GDestroyNotify destroy_func)
+{
+  gboolean reallocated;
+  GData *d;
+
+  d = *data;
+
+  if (!d)
+    {
+      d = g_malloc (sizeof (GData));
+      d->len = 0;
+      d->alloc = 1;
+      *data = d;
+      reallocated = TRUE;
+    }
+  else if (d->len == d->alloc)
+    {
+      d->alloc = d->alloc * 2u;
+      d = g_realloc (d, G_STRUCT_OFFSET (GData, data) + d->alloc * sizeof (GDataElt));
+      *data = d;
+      reallocated = TRUE;
+    }
+  else
+    reallocated = FALSE;
+
+  d->data[d->len] = (GDataElt){
+    .key = key_id,
+    .data = new_data,
+    .destroy = destroy_func,
+  };
+  d->len++;
+
+  return reallocated;
+}
+
+static GDataElt *
+datalist_find (GData *data, GQuark key_id, guint32 *out_idx)
+{
+  guint32 i;
+
+  if (data)
+    {
+      for (i = 0; i < data->len; i++)
+        {
+          GDataElt *data_elt = &data->data[i];
+
+          if (data_elt->key == key_id)
+            {
+              if (out_idx)
+                *out_idx = i;
+              return data_elt;
+            }
+        }
+    }
+  if (out_idx)
+    *out_idx = G_MAXUINT32;
+  return NULL;
+}
+
 /**
  * g_datalist_clear: (skip)
  * @datalist: a datalist.
@@ -275,25 +335,22 @@ g_data_set_internal (GData	  **datalist,
 		     GDestroyNotify new_destroy_func,
 		     GDataset	   *dataset)
 {
-  GData *d, *old_d;
+  GData *d;
   GData *new_d = NULL;
-  GDataElt old, *data, *data_last, *data_end;
+  GDataElt old, *data;
+  guint32 idx;
 
   d = g_datalist_lock_and_get (datalist);
 
+  data = datalist_find (d, key_id, &idx);
+
   if (new_data == NULL) /* remove */
     {
-      if (d)
+      if (data)
-	{
-	  data = d->data;
-	  data_last = data + d->len - 1;
-	  while (data <= data_last)
-	    {
-	      if (data->key == key_id)
         {
           old = *data;
-		  if (data != data_last)
+          if (idx != d->len - 1u)
-		    *data = *data_last;
+            *data = d->data[d->len - 1u];
           d->len--;
 
           /* We don't bother to shrink, but if all data are now gone
@@ -338,20 +395,10 @@ g_data_set_internal (GData	  **datalist,
 
           return old.data;
         }
-	      data++;
-	    }
-	}
     }
   else
     {
-      old.data = NULL;
+      if (data)
-      if (d)
-	{
-	  data = d->data;
-	  data_end = data + d->len;
-	  while (data < data_end)
-	    {
-	      if (data->key == key_id)
         {
           if (!data->destroy)
             {
@@ -379,30 +426,10 @@ g_data_set_internal (GData	  **datalist,
             }
           return NULL;
         }
-	      data++;
-	    }
-	}
 
       /* The key was not found, insert it */
-      old_d = d;
+      if (datalist_append (&d, key_id, new_data, new_destroy_func))
-      if (d == NULL)
-	{
-	  d = g_malloc (sizeof (GData));
-	  d->len = 0;
-	  d->alloc = 1;
-	}
-      else if (d->len == d->alloc)
-	{
-	  d->alloc = d->alloc * 2;
-	  d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt));
-	}
-      if (old_d != d)
         new_d = d;
-
-      d->data[d->len].key = key_id;
-      d->data[d->len].data = new_data;
-      d->data[d->len].destroy = new_destroy_func;
-      d->len++;
     }
 
   if (new_d)
@@ -910,24 +937,13 @@ g_datalist_id_dup_data (GData          **datalist,
   gpointer val = NULL;
   gpointer retval = NULL;
   GData *d;
-  GDataElt *data, *data_end;
+  GDataElt *data;
 
   d = g_datalist_lock_and_get (datalist);
-  if (d)
+
-    {
+  data = datalist_find (d, key_id, NULL);
-      data = d->data;
+  if (data)
-      data_end = data + d->len;
-      do
-        {
-          if (data->key == key_id)
-            {
     val = data->data;
-              break;
-            }
-          data++;
-        }
-      while (data < data_end);
-    }
 
   if (dup_func)
     retval = dup_func (val, user_data);
@@ -978,9 +994,10 @@ g_datalist_id_replace_data (GData          **datalist,
   gpointer val = NULL;
   GData *d;
   GData *new_d = NULL;
-  GDataElt *data, *data_end;
+  GDataElt *data;
   gboolean free_d = FALSE;
   gboolean set_new_d = FALSE;
+  guint32 idx;
 
   g_return_val_if_fail (datalist != NULL, FALSE);
   g_return_val_if_fail (key_id != 0, FALSE);
@@ -989,13 +1006,9 @@ g_datalist_id_replace_data (GData          **datalist,
     *old_destroy = NULL;
 
   d = g_datalist_lock_and_get (datalist);
-  if (d)
+
-    {
+  data = datalist_find (d, key_id, &idx);
-      data = d->data;
+  if (data)
-      data_end = data + d->len - 1;
-      while (data <= data_end)
-        {
-          if (data->key == key_id)
     {
       val = data->data;
       if (val == oldval)
@@ -1009,8 +1022,8 @@ g_datalist_id_replace_data (GData          **datalist,
             }
           else
             {
-                     if (data != data_end)
+              if (idx != d->len - 1u)
-                       *data = *data_end;
+                *data = d->data[d->len - 1u];
               d->len--;
 
               /* We don't bother to shrink, but if all data are now gone
@@ -1023,39 +1036,15 @@ g_datalist_id_replace_data (GData          **datalist,
                 }
             }
         }
-              break;
-            }
-          data++;
-        }
     }
 
   if (val == NULL && oldval == NULL && newval != NULL)
     {
-      GData *old_d;
+      if (datalist_append (&d, key_id, newval, destroy))
-
-      /* insert newval */
-      old_d = d;
-      if (d == NULL)
-	{
-          d = g_malloc (sizeof (GData));
-          d->len = 0;
-          d->alloc = 1;
-        }
-      else if (d->len == d->alloc)
-        {
-          d->alloc = d->alloc * 2;
-          d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt));
-        }
-      if (old_d != d)
         {
           new_d = d;
           set_new_d = TRUE;
         }
-
-      d->data[d->len].key = key_id;
-      d->data[d->len].data = newval;
-      d->data[d->len].destroy = destroy;
-      d->len++;
     }
 
   if (set_new_d)