commit a7e69339dcda3d3360f3b03bac5272f9c1c0176d
author Vincent Povirk <vincent@codeweavers.com> Tue Oct 27 16:48:39 2009 -0500
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 29 15:46:16 2009 +0100
tree 553b15432931f04a7f840c2307b5311d1a40581e
parent d1f95617474d77867ccc84c5846d0b295f101a9b

ole32: Reduce duplicated code in adjustPropertyChain.

Most of the work is the same regardless of relation type, so bring
those parts out of the relation type test.

dlls/ole32/storage32.c

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index fe74fb9..470dc83 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2135,107 +2135,43 @@
   HRESULT hr                     = S_OK;
   BOOL  res                    = TRUE;
 
+  if (propertyToDelete.leftChild != PROPERTY_NULL)
+  {
+    /*
+     * Replace the deleted entry with its left child
+     */
+    newLinkProperty = propertyToDelete.leftChild;
+
+    if (propertyToDelete.rightChild != PROPERTY_NULL)
+    {
+      /*
+       * We also need to find a place for the other link, setup variables
+       * to do this at the end...
+       */
+      needToFindAPlaceholder = TRUE;
+      storeNode              = propertyToDelete.leftChild;
+      toStoreNode            = propertyToDelete.rightChild;
+      relationType           = PROPERTY_RELATION_NEXT;
+    }
+  }
+  else if (propertyToDelete.rightChild != PROPERTY_NULL)
+  {
+    /*
+     * Replace the deleted entry with its right child
+     */
+    newLinkProperty = propertyToDelete.rightChild;
+  }
+
   if (typeOfRelation == PROPERTY_RELATION_PREVIOUS)
   {
-    if (propertyToDelete.leftChild != PROPERTY_NULL)
-    {
-      /*
-       * Set the parent previous to the property to delete previous
-       */
-      newLinkProperty = propertyToDelete.leftChild;
-
-      if (propertyToDelete.rightChild != PROPERTY_NULL)
-      {
-        /*
-         * We also need to find a storage for the other link, setup variables
-         * to do this at the end...
-         */
-        needToFindAPlaceholder = TRUE;
-        storeNode              = propertyToDelete.leftChild;
-        toStoreNode            = propertyToDelete.rightChild;
-        relationType           = PROPERTY_RELATION_NEXT;
-      }
-    }
-    else if (propertyToDelete.rightChild != PROPERTY_NULL)
-    {
-      /*
-       * Set the parent previous to the property to delete next
-       */
-      newLinkProperty = propertyToDelete.rightChild;
-    }
-
-    /*
-     * Link it for real...
-     */
     parentProperty.leftChild = newLinkProperty;
-
   }
   else if (typeOfRelation == PROPERTY_RELATION_NEXT)
   {
-    if (propertyToDelete.leftChild != PROPERTY_NULL)
-    {
-      /*
-       * Set the parent next to the property to delete next previous
-       */
-      newLinkProperty = propertyToDelete.leftChild;
-
-      if (propertyToDelete.rightChild != PROPERTY_NULL)
-      {
-        /*
-         * We also need to find a storage for the other link, setup variables
-         * to do this at the end...
-         */
-        needToFindAPlaceholder = TRUE;
-        storeNode              = propertyToDelete.leftChild;
-        toStoreNode            = propertyToDelete.rightChild;
-        relationType           = PROPERTY_RELATION_NEXT;
-      }
-    }
-    else if (propertyToDelete.rightChild != PROPERTY_NULL)
-    {
-      /*
-       * Set the parent next to the property to delete next
-       */
-      newLinkProperty = propertyToDelete.rightChild;
-    }
-
-    /*
-     * Link it for real...
-     */
     parentProperty.rightChild = newLinkProperty;
   }
   else /* (typeOfRelation == PROPERTY_RELATION_DIR) */
   {
-    if (propertyToDelete.leftChild != PROPERTY_NULL)
-    {
-      /*
-       * Set the parent dir to the property to delete previous
-       */
-      newLinkProperty = propertyToDelete.leftChild;
-
-      if (propertyToDelete.rightChild != PROPERTY_NULL)
-      {
-        /*
-         * We also need to find a storage for the other link, setup variables
-         * to do this at the end...
-         */
-        needToFindAPlaceholder = TRUE;
-        storeNode              = propertyToDelete.leftChild;
-        toStoreNode            = propertyToDelete.rightChild;
-        relationType           = PROPERTY_RELATION_NEXT;
-      }
-    }
-    else if (propertyToDelete.rightChild != PROPERTY_NULL)
-    {
-      /*
-       * Set the parent dir to the property to delete next
-       */
-      newLinkProperty = propertyToDelete.rightChild;
-    }
-
-    /*
-     * Link it for real...
-     */
     parentProperty.dirProperty = newLinkProperty;
   }