Skip to content

"path" argument isn't used in masternode conf read function #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/darkcoind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ bool AppInit(int argc, char* argv[])
}

std::string strErr;
if(!masternodeConfig.read(GetMasternodeConfigFile(), strErr)) {
if(!masternodeConfig.read(strErr)) {
fprintf(stderr,"Error reading masternode configuration file: %s\n", strErr.c_str());
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/masternodeconfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ void CMasternodeConfig::add(std::string alias, std::string ip, std::string privK
entries.push_back(cme);
}

bool CMasternodeConfig::read(boost::filesystem::path path, std::string& strErr) {
bool CMasternodeConfig::read(std::string& strErr) {
boost::filesystem::ifstream streamConfig(GetMasternodeConfigFile());
if (!streamConfig.good()) {
return true; // No masternode.conf file is OK
Expand Down
2 changes: 1 addition & 1 deletion src/masternodeconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class CMasternodeConfig
}

void clear();
bool read(boost::filesystem::path path, std::string& strErr);
bool read(std::string& strErr);
void add(std::string alias, std::string ip, std::string privKey, std::string txHash, std::string outputIndex);

std::vector<CMasternodeEntry>& getEntries() {
Expand Down
2 changes: 1 addition & 1 deletion src/qt/darkcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ int main(int argc, char *argv[])
}

string strErr;
if(!masternodeConfig.read(GetMasternodeConfigFile(), strErr)) {
if(!masternodeConfig.read(strErr)) {
QMessageBox::critical(0, QObject::tr("Darkcoin"),
QObject::tr("Error reading masternode configuration file: %1").arg(strErr.c_str()));
return false;
Expand Down