summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
diff options
context:
space:
mode:
authorAndreas Becker <atayoohoo@googlemail.com>2011-04-28 00:59:28 +0200
committerKatarina Machalkova <kmachalkova@suse.cz>2011-04-28 13:45:46 +0200
commit9ad4eeb4fa413b1a3e084d141c6eb01795f95b7f (patch)
tree031b7ad30c650665210cb5b63d59efe740fd57d1 /setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
parent8a9f54bc1283b7137a90506e29dba7962dd73f83 (diff)
fixed cppcheck warnings
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx')
-rw-r--r--setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx b/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
index d94b65459d8a..ffa1dfe0d50b 100644
--- a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
@@ -80,7 +80,6 @@ extern "C" UINT __stdcall copyExtensionData(MSIHANDLE handle) {
std::_tstring sSourceDir = GetMsiProperty( handle, TEXT("SourceDir") );
std::_tstring sExtensionDir = sSourceDir + TEXT("extension\\");
std::_tstring sPattern = sExtensionDir + TEXT("*.oxt");
- // std::_tstring mystr;
// Finding all oxt files in sExtensionDir
@@ -91,7 +90,6 @@ extern "C" UINT __stdcall copyExtensionData(MSIHANDLE handle) {
if ( hFindOxt != INVALID_HANDLE_VALUE )
{
bool fNextFile = false;
- bool fSuccess = true;
bool bFailIfExist = true;
std::_tstring sDestDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
@@ -101,9 +99,9 @@ extern "C" UINT __stdcall copyExtensionData(MSIHANDLE handle) {
std::_tstring sShareDir = sDestDir + TEXT("share");
std::_tstring sExtDir = sShareDir + TEXT("\\extension");
std::_tstring sExtInstDir = sExtDir + TEXT("\\install");
- bool bDir = CreateDirectory(sShareDir.c_str(), NULL);
- bDir = CreateDirectory(sExtDir.c_str(), NULL);
- bDir = CreateDirectory(sExtInstDir.c_str(), NULL);
+ CreateDirectory(sShareDir.c_str(), NULL);
+ CreateDirectory(sExtDir.c_str(), NULL);
+ CreateDirectory(sExtInstDir.c_str(), NULL);
do
{
@@ -112,7 +110,7 @@ extern "C" UINT __stdcall copyExtensionData(MSIHANDLE handle) {
std::_tstring sSourceFile = sExtensionDir + sOxtFile;
std::_tstring sDestFile = sShareInstallDir + sOxtFile;
- fSuccess = CopyFile( sSourceFile.c_str(), sDestFile.c_str(), bFailIfExist );
+ CopyFile( sSourceFile.c_str(), sDestFile.c_str(), bFailIfExist );
fNextFile = FindNextFile( hFindOxt, &aFindFileData );