[1/4] msi: Remove an unused parameter from msi_create_table.

Hans Leidekker hans at codeweavers.com
Fri Sep 23 04:12:02 CDT 2011


---
 dlls/msi/create.c |    3 +--
 dlls/msi/query.h  |    2 +-
 dlls/msi/table.c  |    5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/create.c b/dlls/msi/create.c
index 592d73b..c679d6b 100644
--- a/dlls/msi/create.c
+++ b/dlls/msi/create.c
@@ -61,7 +61,6 @@ static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT
 static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
-    MSITABLE *table;
     BOOL persist = (cv->bIsTemp) ? MSICONDITION_FALSE : MSICONDITION_TRUE;
 
     TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name),
@@ -70,7 +69,7 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     if (cv->bIsTemp && !cv->hold)
         return ERROR_SUCCESS;
 
-    return msi_create_table( cv->db, cv->name, cv->col_info, persist, &table);
+    return msi_create_table( cv->db, cv->name, cv->col_info, persist );
 }
 
 static UINT CREATE_close( struct tagMSIVIEW *view )
diff --git a/dlls/msi/query.h b/dlls/msi/query.h
index b9d34ad..76fd12e 100644
--- a/dlls/msi/query.h
+++ b/dlls/msi/query.h
@@ -138,6 +138,6 @@ int sqliteGetToken(const WCHAR *z, int *tokenType) DECLSPEC_HIDDEN;
 MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN;
 
 UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
-                       MSICONDITION persistent, MSITABLE **table_ret) DECLSPEC_HIDDEN;
+                       MSICONDITION persistent ) DECLSPEC_HIDDEN;
 
 #endif /* __WINE_MSI_QUERY_H */
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 0ea0727..c35a95d 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -725,7 +725,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF
 }
 
 UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
-                       MSICONDITION persistent, MSITABLE **table_ret)
+                       MSICONDITION persistent )
 {
     enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent;
     UINT r, nField;
@@ -870,10 +870,7 @@ err:
         tv->ops->delete( tv );
 
     if (r == ERROR_SUCCESS)
-    {
         list_add_head( &db->tables, &table->entry );
-        *table_ret = table;
-    }
     else
         free_table( table );
 
-- 
1.7.5.4







More information about the wine-patches mailing list