From 9aac7576c1b241bece51fb00bf0aa415bd3e8f0b Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 9 Mar 2020 18:14:05 +0000 Subject: [PATCH] [xswiftbus] Fixed line number counting in config parser --- src/xswiftbus/config.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/xswiftbus/config.cpp b/src/xswiftbus/config.cpp index 0fa2e6cff..b0e29d697 100644 --- a/src/xswiftbus/config.cpp +++ b/src/xswiftbus/config.cpp @@ -30,9 +30,7 @@ namespace XSwiftBus if (! configFile.is_open()) { return; } std::string line; - int lineNo = 1; - - while (std::getline(configFile, line)) + for (int lineNo = 1; std::getline(configFile, line); ++lineNo) { line.erase(std::remove_if(line.begin(), line.end(), isspace), line.end()); if (line.empty() || line[0] == '#') { continue; } @@ -41,7 +39,6 @@ namespace XSwiftBus if (delimiterPos == std::string::npos) { WARNING_LOG("xswiftbus.conf line " + std::to_string(lineNo) + ": Skipping invalid line!"); - lineNo++; continue; } @@ -51,7 +48,6 @@ namespace XSwiftBus if (key.empty() || value.empty()) { WARNING_LOG("xswiftbus.conf line " + std::to_string(lineNo) + ": Skipping invalid line!"); - lineNo++; continue; } @@ -64,18 +60,14 @@ namespace XSwiftBus else { WARNING_LOG("xswiftbus.conf line " + std::to_string(lineNo) + ": Unknown variable " + key + "!"); - lineNo++; continue; } if (! valid) { WARNING_LOG("xswiftbus.conf line " + std::to_string(lineNo) + ": Skipping invalid line!"); - lineNo++; continue; } - - lineNo++; } }