ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Remove unused variables.

This commit is contained in:
Andrew Talbot 2008-04-21 22:23:21 +01:00 committed by Alexandre Julliard
parent 80b629faf3
commit 68975938f6
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msi/action.c
View File

@ -5068,7 +5068,7 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags )
static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param )
{ {
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
LPCWSTR name, value, comp; LPCWSTR name, value;
LPWSTR data = NULL, newval = NULL; LPWSTR data = NULL, newval = NULL;
LPWSTR deformatted = NULL, ptr; LPWSTR deformatted = NULL, ptr;
DWORD flags, type, size; DWORD flags, type, size;
@ -5088,7 +5088,6 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param )
name = MSI_RecordGetString(rec, 2); name = MSI_RecordGetString(rec, 2);
value = MSI_RecordGetString(rec, 3); value = MSI_RecordGetString(rec, 3);
comp = MSI_RecordGetString(rec, 4);
res = env_set_flags(&name, &value, &flags); res = env_set_flags(&name, &value, &flags);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)

5
dlls/msi/msiquery.c
View File

@ -869,15 +869,12 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
'`','T','a','b','l','e','`',' ','=',' ','\'','%','s','\'',0 }; '`','T','a','b','l','e','`',' ','=',' ','\'','%','s','\'',0 };
struct msi_primary_key_record_info info; struct msi_primary_key_record_info info;
MSIQUERY *query = NULL; MSIQUERY *query = NULL;
MSIVIEW *view;
UINT r; UINT r;
r = MSI_OpenQuery( db, &query, sql, table ); r = MSI_OpenQuery( db, &query, sql, table );
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
return r; return r;
view = query->view;
/* count the number of primary key records */ /* count the number of primary key records */
info.n = 0; info.n = 0;
info.rec = 0; info.rec = 0;

5
dlls/msi/source.c
View File

@ -153,7 +153,6 @@ UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode,
LPWSTR usersid = NULL; LPWSTR usersid = NULL;
LPWSTR volume = NULL; LPWSTR volume = NULL;
LPWSTR prompt = NULL; LPWSTR prompt = NULL;
DWORD volumesz, promptsz;
UINT r = ERROR_INVALID_PARAMETER; UINT r = ERROR_INVALID_PARAMETER;
TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_a(szProductCodeOrPatchCode), TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_a(szProductCodeOrPatchCode),
@ -183,11 +182,11 @@ UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode,
goto done; goto done;
if (szVolumeLabel && pcchVolumeLabel) if (szVolumeLabel && pcchVolumeLabel)
volumesz = WideCharToMultiByte(CP_ACP, 0, volume, -1, szVolumeLabel, WideCharToMultiByte(CP_ACP, 0, volume, -1, szVolumeLabel,
*pcchVolumeLabel + 1, NULL, NULL); *pcchVolumeLabel + 1, NULL, NULL);
if (szDiskPrompt) if (szDiskPrompt)
promptsz = WideCharToMultiByte(CP_ACP, 0, prompt, -1, szDiskPrompt, WideCharToMultiByte(CP_ACP, 0, prompt, -1, szDiskPrompt,
*pcchDiskPrompt + 1, NULL, NULL); *pcchDiskPrompt + 1, NULL, NULL);
done: done:

3
dlls/msi/sql.y
View File

@ -142,9 +142,8 @@ oneinsert:
{ {
SQL_input *sql = (SQL_input*) info; SQL_input *sql = (SQL_input*) info;
MSIVIEW *insert = NULL; MSIVIEW *insert = NULL;
UINT r;
r = INSERT_CreateView( sql->db, &insert, $3, $5, $9, FALSE ); INSERT_CreateView( sql->db, &insert, $3, $5, $9, FALSE );
if( !insert ) if( !insert )
YYABORT; YYABORT;
$$ = insert; $$ = insert;

3
dlls/msi/suminfo.c
View File

@ -371,7 +371,7 @@ static UINT save_summary_info( const MSISUMMARYINFO * si, IStream *stm )
LPBYTE data = NULL; LPBYTE data = NULL;
ULONG count, sz; ULONG count, sz;
HRESULT r; HRESULT r;
int i, n; int i;
/* write the header */ /* write the header */
sz = sizeof set_hdr; sz = sizeof set_hdr;
@ -397,7 +397,6 @@ static UINT save_summary_info( const MSISUMMARYINFO * si, IStream *stm )
section_hdr.cbSection = sizeof section_hdr; section_hdr.cbSection = sizeof section_hdr;
section_hdr.cbSection += (get_property_count( si->property ) * sizeof idofs[0]); section_hdr.cbSection += (get_property_count( si->property ) * sizeof idofs[0]);
section_hdr.cProperties = 0; section_hdr.cProperties = 0;
n = 0;
for( i = 0; i < MSI_MAX_PROPS; i++ ) for( i = 0; i < MSI_MAX_PROPS; i++ )
{ {
sz = write_property_to_data( &si->property[i], NULL ); sz = write_property_to_data( &si->property[i], NULL );