xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-12 09:10:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code deduplication GetQuotedString()

Browse Source 
Moved single function GetQuotedString() to MyString

Signed-off-by: Sergey G. Brester <info@sebres.de>
Reviewed-by: Tino Reichardt <milky-7zip@mcmilk.de>
This commit is contained in:
sebres
2023-04-06 18:57:17 +02:00
committed by Tino Reichardt
parent 8cfdd747c8
commit 19e97e4c68
7 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CPP/7zip/UI/Common/CompressCall.cpp
View File

@@ -50,14 +50,6 @@ using namespace NWindows;
static NCompression::CInfo m_RegistryInfo; static NCompression::CInfo m_RegistryInfo;
extern HWND g_HWND; extern HWND g_HWND;
UString GetQuotedString(const UString &s)
{
UString s2 ('\"');
s2 += s;
s2 += '\"';
return s2;
}
static void ErrorMessage(LPCWSTR message) static void ErrorMessage(LPCWSTR message)
{ {
MessageBoxW(g_HWND, message, L"7-Zip ZS", MB_ICONERROR | MB_OK); MessageBoxW(g_HWND, message, L"7-Zip ZS", MB_ICONERROR | MB_OK);

2
CPP/7zip/UI/Common/CompressCall.h
View File

@@ -5,8 +5,6 @@
#include "../../../Common/MyString.h" #include "../../../Common/MyString.h"
UString GetQuotedString(const UString &s);
HRESULT CompressFiles( HRESULT CompressFiles(
const UString &arcPathPrefix, const UString &arcPathPrefix,
const UString &arcName, const UString &arcName,

11
CPP/7zip/UI/Common/CompressCall2.cpp
View File

@@ -59,17 +59,6 @@ static void ThrowException_if_Error(HRESULT res)
#endif #endif
UString GetQuotedString(const UString &s)
{
UString s2 ('\"');
s2 += s;
s2 += '\"';
return s2;
}
static void ErrorMessage(LPCWSTR message) static void ErrorMessage(LPCWSTR message)
{ {
MessageBoxW(g_HWND, message, L"7-Zip ZS", MB_ICONERROR); MessageBoxW(g_HWND, message, L"7-Zip ZS", MB_ICONERROR);

3
CPP/7zip/UI/FileManager/PanelItemOpen.cpp
View File

@@ -685,9 +685,6 @@ static bool DoItemAlwaysStart(const UString &name)
return FindExt(kStartExtensions, name); return FindExt(kStartExtensions, name);
} }
UString GetQuotedString(const UString &s);
void SplitCmdLineSmart(const UString &cmd, UString &prg, UString &params); void SplitCmdLineSmart(const UString &cmd, UString &prg, UString &params);
void SplitCmdLineSmart(const UString &cmd, UString &prg, UString &params) void SplitCmdLineSmart(const UString &cmd, UString &prg, UString &params)
{ {

10
CPP/Common/MyString.cpp
View File

@@ -1803,3 +1803,13 @@ FString us2fs(const wchar_t *s)
} }
#endif // USE_UNICODE_FSTRING #endif // USE_UNICODE_FSTRING
// ----------------------------------------
UString GetQuotedString(const UString &s)
{
UString s2 ('\"');
s2 += s;
s2 += '\"';
return s2;
}

7
CPP/Common/MyString.h
View File

@@ -994,9 +994,6 @@ typedef const FChar *CFSTR;
typedef CObjectVector<FString> FStringVector; typedef CObjectVector<FString> FStringVector;
#endif
#if defined(_WIN32) #if defined(_WIN32)
// #include <wchar.h> // #include <wchar.h>
@@ -1012,3 +1009,7 @@ typedef CObjectVector<FString> FStringVector;
#define WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT ((wchar_t)((unsigned)(0xF000) + (unsigned)'\\')) #define WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT ((wchar_t)((unsigned)(0xF000) + (unsigned)'\\'))
// #define WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT '_' // #define WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT '_'
#endif #endif
UString GetQuotedString(const UString &s);
#endif

10
CPP/Windows/ProcessUtils.cpp
View File

@@ -12,16 +12,6 @@ extern bool g_IsNT;
namespace NWindows { namespace NWindows {
#ifndef UNDER_CE
static UString GetQuotedString(const UString &s)
{
UString s2 ('\"');
s2 += s;
s2 += '\"';
return s2;
}
#endif
WRes CProcess::Create(LPCWSTR imageName, const UString &params, LPCWSTR curDir) WRes CProcess::Create(LPCWSTR imageName, const UString &params, LPCWSTR curDir)
{ {
/* /*