diff options
| author | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-10-02 17:42:35 +0200 |
|---|---|---|
| committer | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-10-07 15:57:49 +0200 |
| commit | 3251b313193196c9512c950da740757c46a07ddd (patch) | |
| tree | f99e3246fad43accf848aab9130f7195c904f2ab /setup_native | |
| parent | 69cc1ee085ebb5c35c09f50127d00ad90495d563 (diff) | |
cppcheck reduce scope of var in setup_native/...regactivex.cxx
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index 8e1ca28892bf..7552e866ebac 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -305,15 +305,14 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI ) //---------------------------------------------------------- extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI ) { - int nOldInstallMode = 0; - int nInstallMode = 0; - int nDeinstallMode = 0; - INSTALLSTATE current_state; INSTALLSTATE future_state; if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", ¤t_state, &future_state ) ) { + int nOldInstallMode = 0; + int nInstallMode = 0; + int nDeinstallMode = 0; BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI ); BOOL bInstallFor64Bit = MakeInstallFor64Bit( hMSI ); |