Skip to content

Commit

Permalink
conf
Browse files Browse the repository at this point in the history
  • Loading branch information
sphinxcoin committed Sep 22, 2018
1 parent 442a449 commit a2b7606
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-blocknotify=<cmd>", _("Execute command when the best block changes (%s in cmd is replaced by block hash)"));
strUsage += HelpMessageOpt("-blocksizenotify=<cmd>", _("Execute command when the best block changes and its size is over (%s in cmd is replaced by block hash, %d with the block size)"));
strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), 500));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "sphinxcoin.conf"));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "Sphinxcoin.conf"));
if (mode == HMM_BITCOIND) {
#if !defined(WIN32)
strUsage += HelpMessageOpt("-daemon", _("Run in the background as a daemon and accept commands"));
Expand Down
2 changes: 1 addition & 1 deletion src/rpcmasternode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ UniValue masternode(const UniValue& params, bool fHelp)
" debug - Print masternode status\n"
" genkey - Generate new masternodeprivkey\n"
" outputs - Print masternode compatible outputs\n"
" start - Start masternode configured in sphinxcoin.conf\n"
" start - Start masternode configured in Sphinxcoin.conf\n"
" start-alias - Start single masternode by assigned alias configured in masternode.conf\n"
" start-<mode> - Start masternodes configured in masternode.conf (<mode>: 'all', 'missing', 'disabled')\n"
" status - Print masternode status information\n"
Expand Down
2 changes: 1 addition & 1 deletion src/rpcmining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ UniValue getgenerate(const UniValue& params, bool fHelp)
throw runtime_error(
"getgenerate\n"
"\nReturn if the server is set to generate coins or not. The default is false.\n"
"It is set with the command line argument -gen (or sphinxcoin.conf setting gen)\n"
"It is set with the command line argument -gen (or Sphinxcoin.conf setting gen)\n"
"It can also be set with the setgenerate call.\n"
"\nResult\n"
"true|false (boolean) If the server is set to generate coins or not\n"
Expand Down
2 changes: 1 addition & 1 deletion src/sphx-cli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ std::string HelpMessageCli()
string strUsage;
strUsage += HelpMessageGroup(_("Options:"));
strUsage += HelpMessageOpt("-?", _("This help message"));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "sphinxcoin.conf"));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "Sphinxcoin.conf"));
strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
strUsage += HelpMessageOpt("-testnet", _("Use the test network"));
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be "
Expand Down
2 changes: 1 addition & 1 deletion src/sphxd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ bool AppInit(int argc, char* argv[])
//
// Parameters
//
// If Qt is used, parameters/sphinxcoin.conf are parsed in qt/sphx.cpp's main()
// If Qt is used, parameters/Sphinxcoin.conf are parsed in qt/sphx.cpp's main()
ParseParameters(argc, argv);

// Process help and version before taking care about datadir
Expand Down
6 changes: 3 additions & 3 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ void ClearDatadirCache()

boost::filesystem::path GetConfigFile()
{
boost::filesystem::path pathConfigFile(GetArg("-conf", "sphinxcoin.conf"));
boost::filesystem::path pathConfigFile(GetArg("-conf", "Sphinxcoin.conf"));
if (!pathConfigFile.is_complete())
pathConfigFile = GetDataDir(false) / pathConfigFile;

Expand All @@ -513,7 +513,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
{
boost::filesystem::ifstream streamConfig(GetConfigFile());
if (!streamConfig.good()) {
// Create empty sphinxcoin.conf if it does not exist
// Create empty Sphinxcoin.conf if it does not exist
FILE* configFile = fopen(GetConfigFile().string().c_str(), "a");
if (configFile != NULL)
fclose(configFile);
Expand All @@ -524,7 +524,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
setOptions.insert("*");

for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) {
// Don't overwrite existing settings so command line settings override sphinxcoin.conf
// Don't overwrite existing settings so command line settings override Sphinxcoin.conf
string strKey = string("-") + it->string_key;
string strValue = it->value[0];
InterpretNegativeSetting(strKey, strValue);
Expand Down

0 comments on commit a2b7606

Please sign in to comment.