fly/flightgear
1
0
Fork 0
Code Activity

Improve parsing of apt.dat header

Browse source 
Properly report errors in the line that is supposed to contain the
format version of an apt.dat file.
This commit is contained in:
Florent Rougon 2019-03-27 08:31:09 +01:00
parent 8fbbf91270
commit 378999dd80
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Airports/apt_loader.cxx
View file

@ -60,6 +60,8 @@
using std::vector;
using std::string;
namespace strutils = simgear::strutils;
static FGPositioned::Type fptypeFromRobinType(unsigned int aType)
{
@ -129,12 +131,20 @@ void APTLoader::readAptDatFile(const SGPath &aptdb_file,
stripped_line);
}
} else { // second line of the file
std::istringstream s(line);
int apt_dat_format_version;
s >> apt_dat_format_version;
SG_LOG( SG_GENERAL, SG_INFO,
"apt.dat format version (" << apt_dat << "): " <<
apt_dat_format_version );
vector<string> fields(strutils::split(line, 0, 1));
if (fields.empty()) {
string errMsg = "unable to parse format version: empty line";
SG_LOG(SG_GENERAL, SG_ALERT, apt_dat << ": " << errMsg);
throw sg_format_exception("cannot parse '" + apt_dat + "': " + errMsg,
string());
} else {
unsigned int aptDatFormatVersion =
strutils::readNonNegativeInt<unsigned int>(fields[0]);
SG_LOG(SG_GENERAL, SG_INFO,
"apt.dat format version (" << apt_dat << "): " <<
aptDatFormatVersion);
}
}
} // end of the apt.dat header