flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[xswiftbus] Fixed line number counting in config parser

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-03-09 18:14:05 +00:00
parent a6eaa57f05
commit 9aac7576c1
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xswiftbus/config.cpp
View File

@@ -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++;
}
}