gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CLI: Cleaned up overly complex use of 'terminated'.

Browse Source
This commit is contained in:
Paul Beckingham
2015-06-06 10:51:32 -04:00
parent 27cb2afe2c
commit 61470d7820
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/CLI.cpp
View File

@@ -250,16 +250,14 @@ void CLI::getDataLocation (int argc, const char** argv, Path& data)
if (location != "") if (location != "")
data = location; data = location;
bool terminated = false;
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
{ {
std::string raw = argv[i]; std::string raw = argv[i];
if (raw == "--") if (raw == "--")
terminated = true; break;
if (! terminated && if (raw.length () > 17 &&
raw.length () > 17 &&
raw.substr (0, 16) == "rc.data.location") raw.substr (0, 16) == "rc.data.location")
{ {
data = Directory (raw.substr (17)); data = Directory (raw.substr (17));
@@ -274,16 +272,14 @@ void CLI::getDataLocation (int argc, const char** argv, Path& data)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void CLI::applyOverrides (int argc, const char** argv) void CLI::applyOverrides (int argc, const char** argv)
{ {
bool terminated = false;
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
{ {
std::string raw = argv[i]; std::string raw = argv[i];
if (raw == "--") if (raw == "--")
terminated = true; break;
if (! terminated && if (raw.length () > 3 &&
raw.length () > 3 &&
raw.substr (0, 3) == "rc.") raw.substr (0, 3) == "rc.")
{ {
auto sep = raw.find ('=', 3); auto sep = raw.find ('=', 3);