ListBase: Add insert-replace function
authorCampbell Barton <ideasman42@gmail.com>
Sun, 9 Apr 2017 06:07:09 +0000 (16:07 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 9 Apr 2017 06:07:09 +0000 (16:07 +1000)
Handy to replace an existing link
(without having to store before/after links)

Use for id-props

source/blender/blenkernel/intern/idprop.c
source/blender/blenlib/BLI_listbase.h
source/blender/blenlib/intern/listbase.c

index a596869e5e8d628df11117d620b38a16899d1c28..6ebdd371acbcdb54ed5c26a1878fb6b9941c3b2a 100644 (file)
@@ -503,14 +503,9 @@ void IDP_SyncGroupValues(IDProperty *dest, const IDProperty *src)
                                        break;
                                default:
                                {
-                                       IDProperty *tmp = other;
-                                       IDProperty *copy = IDP_CopyProperty(prop);
-
-                                       BLI_insertlinkafter(&dest->data.group, other, copy);
-                                       BLI_remlink(&dest->data.group, tmp);
-
-                                       IDP_FreeProperty(tmp);
-                                       MEM_freeN(tmp);
+                                       BLI_insertlinkreplace(&dest->data.group, other, IDP_CopyProperty(prop));
+                                       IDP_FreeProperty(other);
+                                       MEM_freeN(other);
                                        break;
                                }
                        }
@@ -530,11 +525,9 @@ void IDP_SyncGroupTypes(IDProperty *dst, const IDProperty *src, const bool do_ar
                        if ((prop_dst->type != prop_src->type || prop_dst->subtype != prop_src->subtype) ||
                            (do_arraylen && ELEM(prop_dst->type, IDP_ARRAY, IDP_IDPARRAY) && (prop_src->len != prop_dst->len)))
                        {
-                               IDP_FreeFromGroup(dst, prop_dst);
-                               prop_dst = IDP_CopyProperty(prop_src);
-
-                               dst->len++;
-                               BLI_insertlinkbefore(&dst->data.group, prop_dst_next, prop_dst);
+                               BLI_insertlinkreplace(&dst->data.group, prop_dst, IDP_CopyProperty(prop_src));
+                               IDP_FreeProperty(prop_dst);
+                               MEM_freeN(prop_dst);
                        }
                        else if (prop_dst->type == IDP_GROUP) {
                                IDP_SyncGroupTypes(prop_dst, prop_src, do_arraylen);
@@ -559,11 +552,7 @@ void IDP_ReplaceGroupInGroup(IDProperty *dest, const IDProperty *src)
        for (prop = src->data.group.first; prop; prop = prop->next) {
                for (loop = dest->data.group.first; loop; loop = loop->next) {
                        if (STREQ(loop->name, prop->name)) {
-                               IDProperty *copy = IDP_CopyProperty(prop);
-
-                               BLI_insertlinkafter(&dest->data.group, loop, copy);
-
-                               BLI_remlink(&dest->data.group, loop);
+                               BLI_insertlinkreplace(&dest->data.group, loop, IDP_CopyProperty(prop));
                                IDP_FreeProperty(loop);
                                MEM_freeN(loop);
                                break;
@@ -590,9 +579,7 @@ void IDP_ReplaceInGroup_ex(IDProperty *group, IDProperty *prop, IDProperty *prop
        BLI_assert(prop_exist == IDP_GetPropertyFromGroup(group, prop->name));
 
        if ((prop_exist = IDP_GetPropertyFromGroup(group, prop->name))) {
-               BLI_insertlinkafter(&group->data.group, prop_exist, prop);
-               
-               BLI_remlink(&group->data.group, prop_exist);
+               BLI_insertlinkreplace(&group->data.group, prop_exist, prop);
                IDP_FreeProperty(prop_exist);
                MEM_freeN(prop_exist);
        }
index 96349a7b066a2a72bae1d2bbd87f07340dbba4c4..00e761b81bc3e85ec3ecad00fecf5ce5d988527f 100644 (file)
@@ -67,6 +67,7 @@ void *BLI_poptail(ListBase *listbase) ATTR_NONNULL(1);
 void BLI_addhead(struct ListBase *listbase, void *vlink) ATTR_NONNULL(1);
 void BLI_insertlinkbefore(struct ListBase *listbase, void *vnextlink, void *vnewlink) ATTR_NONNULL(1);
 void BLI_insertlinkafter(struct ListBase *listbase, void *vprevlink, void *vnewlink) ATTR_NONNULL(1);
+void BLI_insertlinkreplace(ListBase *listbase, void *v_l_src, void *v_l_dst) ATTR_NONNULL(1, 2, 3);
 void BLI_listbase_sort(struct ListBase *listbase, int (*cmp)(const void *, const void *)) ATTR_NONNULL(1, 2);
 void BLI_listbase_sort_r(ListBase *listbase, int (*cmp)(void *, const void *, const void *), void *thunk) ATTR_NONNULL(1, 2);
 bool BLI_listbase_link_move(ListBase *listbase, void *vlink, int step) ATTR_NONNULL();
index c9bf4976ae86edf4f01fd4a529e046e476bb3686..6cb7b7d8e3ef5a9e8e91da439ce1ddd2a30b3b72 100644 (file)
@@ -342,6 +342,40 @@ void BLI_insertlinkbefore(ListBase *listbase, void *vnextlink, void *vnewlink)
        }
 }
 
+
+/**
+ * Insert a link in place of another, without changing it's position in the list.
+ *
+ * Puts `vnewlink` in the position of `vreplacelink`, removing `vreplacelink`.
+ * - `vreplacelink` *must* be in the list.
+ * - `vnewlink` *must not* be in the list.
+ */
+void BLI_insertlinkreplace(ListBase *listbase, void *vreplacelink, void *vnewlink)
+{
+       Link *l_old = vreplacelink;
+       Link *l_new = vnewlink;
+
+       /* update adjacent links */
+       if (l_old->next != NULL) {
+               l_old->next->prev = l_new;
+       }
+       if (l_old->prev != NULL) {
+               l_old->prev->next = l_new;
+       }
+
+       /* set direct links */
+       l_new->next = l_old->next;
+       l_new->prev = l_old->prev;
+
+        /* update list */
+       if (listbase->first == l_old) {
+               listbase->first = l_new;
+       }
+       if (listbase->last == l_old) {
+               listbase->last = l_new;
+       }
+}
+
 /**
  * Reinsert \a vlink relative to its current position but offset by \a step. Doesn't move
  * item if new position would exceed list (could optionally move to head/tail).