Factoring out LOG_SWITCH, INI_SWITCH and INI_NUL

Source commit: c5945fad27d8b058e94971f4873cccc31208eba4

source/core/Configuration.cpp

@@ -155,7 +155,7 @@ THierarchicalStorage * TConfiguration::CreateScpStorage(bool & SessionList)
   }
   else if (Storage == stNul)
   {
-    Result = new TIniFileStorage(L"nul");
+    Result = new TIniFileStorage(INI_NUL);
   }
   else
   {

source/core/Interface.h

@@ -7,6 +7,7 @@
 #define HELP_NONE ""
 #define COMMAND_SWITCH L"Command"
 #define SESSIONNAME_SWICH L"SessionName"
+#define INI_NUL L"nul"
 //---------------------------------------------------------------------------
 TConfiguration * __fastcall CreateConfiguration();
 class TOptions;

source/windows/ConsoleRunner.cpp

@@ -2066,8 +2066,10 @@ void __fastcall Usage(TConsole * Console)
   PrintUsageSyntax(Console,
     UnicodeString(!Console->CommandLineOnly() ? L"[/console] " : L"") +
     FORMAT(L"[/script=file] [/%s cmd1...] [/parameter // param1...]", (LowerCase(COMMAND_SWITCH))));
-  PrintUsageSyntax(Console, L"[/log=<logfile> [/loglevel=<level>]] [/xmllog=<logfile> [/xmlgroups]]");
-  PrintUsageSyntax(Console, L"[/ini=<inifile>]");
+  PrintUsageSyntax(Console,
+    FORMAT(L"[/%s=<logfile> [/loglevel=<level>]] [/xmllog=<logfile> [/xmlgroups]]", (LowerCase(LOG_SWITCH))));
+  PrintUsageSyntax(Console,
+    FORMAT(L"[/%s=<inifile>]", (LowerCase(INI_SWITCH))));
   PrintUsageSyntax(Console, L"[/rawconfig config1=value1 config2=value2 ...]");
   PrintUsageSyntax(Console, L"/batchsettings <site_mask> setting1=value1 setting2=value2 ...");
   PrintUsageSyntax(Console, FORMAT(L"/%s keyfile [/%s=output] [/%s] [/%s=comment]",
@@ -2104,11 +2106,11 @@ void __fastcall Usage(TConsole * Console)
   RegisterSwitch(SwitchesUsage, L"/script=", USAGE_SCRIPT);
   RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(COMMAND_SWITCH), USAGE_COMMAND);
   RegisterSwitch(SwitchesUsage, L"/parameter", USAGE_PARAMETER);
-  RegisterSwitch(SwitchesUsage, L"/log=", USAGE_LOG);
+  RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(LOG_SWITCH) + L"=", USAGE_LOG);
   RegisterSwitch(SwitchesUsage, L"/loglevel=", USAGE_LOGLEVEL);
   RegisterSwitch(SwitchesUsage, L"/xmllog=", USAGE_XMLLOG);
   RegisterSwitch(SwitchesUsage, L"/xmlgroups", USAGE_XMLGROUPS);
-  RegisterSwitch(SwitchesUsage, L"/ini=", USAGE_INI);
+  RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(INI_SWITCH) + L"=", USAGE_INI);
   RegisterSwitch(SwitchesUsage, L"/rawconfig", USAGE_RAWCONFIG);
   RegisterSwitch(SwitchesUsage, L"/batchsettings", USAGE_BATCHSETTINGS);
   UnicodeString KeyGenDesc =
@@ -2485,7 +2487,7 @@ int __fastcall Console(TConsoleMode Mode)
         delete StoredSessions->ParseUrl(Session, Params, DefaultsOnly);
 
         UnicodeString LogFile;
-        if (Params->FindSwitch(L"Log", LogFile) && CheckSafe(Params))
+        if (Params->FindSwitch(LOG_SWITCH, LogFile) && CheckSafe(Params))
         {
           Configuration->Usage->Inc(L"ScriptLog");
           Configuration->TemporaryLogging(LogFile);

source/windows/UserInterface.cpp

@@ -35,10 +35,10 @@ TConfiguration * __fastcall CreateConfiguration()
   GUIConfiguration = CustomWinConfiguration;
 
   TProgramParams * Params = TProgramParams::Instance();
-  UnicodeString IniFileName = Params->SwitchValue(L"ini");
+  UnicodeString IniFileName = Params->SwitchValue(INI_SWITCH);
   if (!IniFileName.IsEmpty())
   {
-    if (AnsiSameText(IniFileName, L"nul"))
+    if (AnsiSameText(IniFileName, INI_NUL))
     {
       WinConfiguration->SetNulStorage();
     }

source/windows/WinInterface.h

@@ -34,6 +34,8 @@ const int mpAllowContinueOnError = 0x02;
 #define KEYGEN_OUTPUT_SWITCH L"Output"
 #define KEYGEN_COMMENT_SWITCH L"Comment"
 #define KEYGEN_CHANGE_PASSPHRASE_SWITCH L"ChangePassphrase"
+#define LOG_SWITCH L"Log"
+#define INI_SWITCH L"Ini"
 
 struct TMessageParams
 {

source/windows/WinMain.cpp

@@ -697,7 +697,7 @@ int __fastcall Execute()
 
     Application->HintHidePause = 3000;
 
-    UnicodeString IniFileName = Params->SwitchValue(L"ini");
+    UnicodeString IniFileName = Params->SwitchValue(INI_SWITCH);
     if (!IniFileName.IsEmpty())
     {
       UnicodeString IniFileNameExpanded = ExpandEnvironmentVariables(IniFileName);
@@ -915,7 +915,7 @@ int __fastcall Execute()
             if (CheckSafe(Params))
             {
               UnicodeString LogFile;
-              if (Params->FindSwitch(L"Log", LogFile))
+              if (Params->FindSwitch(LOG_SWITCH, LogFile))
               {
                 Configuration->TemporaryLogging(LogFile);
               }