Hans Leidekker : msi: Remove some dead assignments (clang).
Alexandre Julliard
julliard at winehq.org
Thu Jul 7 13:33:45 CDT 2011
Module: wine
Branch: master
Commit: 9299319b8813239fbf54575ac494aa2f9c2d3a27
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9299319b8813239fbf54575ac494aa2f9c2d3a27
Author: Hans Leidekker <hans at codeweavers.com>
Date: Thu Jul 7 09:22:20 2011 +0200
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 ff9ac81..333746e 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 afc7ee6..1ffe946 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 e58bd82..0e4fb8a 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 ecca7c9..3d062fd 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);
More information about the wine-cvs
mailing list