[1/6] msi: Remove unused and redundant name field from STORAGE structure.

Hans Leidekker hans at codeweavers.com
Mon Apr 19 05:37:02 CDT 2010


---
 dlls/msi/storages.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c
index 6a8134b..144f8fd 100644
--- a/dlls/msi/storages.c
+++ b/dlls/msi/storages.c
@@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 typedef struct tabSTORAGE
 {
     UINT str_index;
-    LPWSTR name;
     IStorage *storage;
 } STORAGE;
 
@@ -78,14 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg)
     if (!storage)
         return NULL;
 
-    storage->name = strdupW(name);
-    if (!storage->name)
-    {
-        msi_free(storage);
-        return NULL;
-    }
-
-    storage->str_index = msi_addstringW(sv->db->strings, 0, storage->name, -1, 1, StringNonPersistent);
+    storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent);
     storage->storage = stg;
 
     if (storage->storage)
@@ -436,8 +428,6 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view)
     {
         if (sv->storages[i]->storage)
             IStorage_Release(sv->storages[i]->storage);
-
-        msi_free(sv->storages[i]->name);
         msi_free(sv->storages[i]);
     }
 
-- 
1.7.0.4







More information about the wine-patches mailing list