From 9299319b8813239fbf54575ac494aa2f9c2d3a27 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Thu, 7 Jul 2011 09:22:20 +0200
Subject: [PATCH] msi: Remove some dead assignments (clang).

---
 dlls/msi/database.c | 11 +++++------
 dlls/msi/font.c     |  1 -
 dlls/msi/record.c   |  2 +-
 dlls/msi/table.c    |  1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index ff9ac8184b0..333746e2f62 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -1518,11 +1518,9 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec)
 static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view,
                                     LPWSTR table, MSIRECORD *rec)
 {
-    LPWSTR query = NULL, clause = NULL;
-    LPWSTR val;
-    LPCWSTR setptr;
-    DWORD size = 1, oldsize;
-    LPCWSTR key;
+    LPWSTR query = NULL, clause = NULL, val;
+    LPCWSTR setptr, key;
+    DWORD size, oldsize;
     MSIRECORD *keys;
     UINT r, i, count;
 
@@ -1538,10 +1536,11 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view,
     if (r != ERROR_SUCCESS)
         return NULL;
 
-    clause = msi_alloc_zero(size * sizeof(WCHAR));
+    clause = msi_alloc_zero(sizeof(WCHAR));
     if (!clause)
         goto done;
 
+    size = 1;
     count = MSI_RecordGetFieldCount(keys);
     for (i = 1; i <= count; i++)
     {
diff --git a/dlls/msi/font.c b/dlls/msi/font.c
index afc7ee63857..1ffe9466e46 100644
--- a/dlls/msi/font.c
+++ b/dlls/msi/font.c
@@ -136,7 +136,6 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id )
 
     ttNTHeader.uNRCount = SWAPWORD(ttNTHeader.uNRCount);
     ttNTHeader.uStorageOffset = SWAPWORD(ttNTHeader.uStorageOffset);
-    bFound = FALSE;
     for(i=0; i<ttNTHeader.uNRCount; i++)
     {
         if (!ReadFile(handle,&ttRecord, sizeof(TT_NAME_RECORD),&dwRead,NULL))
diff --git a/dlls/msi/record.c b/dlls/msi/record.c
index e58bd82e958..0e4fb8a2624 100644
--- a/dlls/msi/record.c
+++ b/dlls/msi/record.c
@@ -833,7 +833,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz)
 
         ofs.QuadPart = cur.QuadPart = 0;
         end.QuadPart = 0;
-        r = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur );
+        IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur );
         IStream_Seek( stm, ofs, STREAM_SEEK_END, &end );
         ofs.QuadPart = cur.QuadPart;
         IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur );
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index ecca7c9bd16..3d062fd0199 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -2746,7 +2746,6 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg,
           debugstr_w(name), tv->num_cols, tv->row_size, rawsize );
 
     /* interpret the data */
-    r = ERROR_SUCCESS;
     for( n=0; n < rawsize;  )
     {
         mask = rawdata[n] | (rawdata[n+1] << 8);