commit 9299319b8813239fbf54575ac494aa2f9c2d3a27
author Hans Leidekker <hans@codeweavers.com> Thu Jul 07 09:22:20 2011 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu Jul 07 14:45:59 2011 +0200
tree 209729d78553386bccdafed88ed5ea17d1ad15f0
parent 7f199e81e1f50852829fdccd2ef070a908bda710

msi: Remove some dead assignments (clang).

dlls/msi/database.c

diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index ff9ac81..333746e 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -1518,11 +1518,9 @@
 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 @@
     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++)
     {

dlls/msi/font.c

diff --git a/dlls/msi/font.c b/dlls/msi/font.c
index afc7ee6..1ffe946 100644
--- a/dlls/msi/font.c
+++ b/dlls/msi/font.c
@@ -136,7 +136,6 @@
 
     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))

dlls/msi/record.c

diff --git a/dlls/msi/record.c b/dlls/msi/record.c
index e58bd82..0e4fb8a 100644
--- a/dlls/msi/record.c
+++ b/dlls/msi/record.c
@@ -833,7 +833,7 @@
 
         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 );

dlls/msi/table.c

diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index ecca7c9..3d062fd 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -2746,7 +2746,6 @@
           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);