diff options
| author | Arne Juul <arnej@verizonmedia.com> | 2020-07-15 11:59:13 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@verizonmedia.com> | 2020-07-15 15:39:24 +0000 |
| commit | 7203e12be128e8453112bdf0cefaa03c44a318f9 (patch) | |
| tree | 65a89e4727180bb32d8d244d7d54f7aa49e3aeb6 /searchlib/src | |
| parent | 6a7116f5d766e455818bc6abae9789ac9bce8bcd (diff) | |
style fixes
Diffstat (limited to 'searchlib/src')
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/geo_location_parser.cpp | 8 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/geo_location_parser.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp b/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp index a44b4f4c5e2..05c53348699 100644 --- a/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp +++ b/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp @@ -43,7 +43,7 @@ GeoLocationParser::GeoLocationParser() {} bool -GeoLocationParser::getDimensionality(const char * &p) { +GeoLocationParser::correctDimensionalitySkip(const char * &p) { if (*p == '2') { p++; if (*p != ',') { @@ -84,8 +84,9 @@ GeoLocationParser::parseOldFormat(const std::string &locStr) return false; } foundBoundingBox = true; - if (!getDimensionality(p)) + if (!correctDimensionalitySkip(p)) { return false; + } _min_x = getInt(p); if (*p != ',') { _parseError = "Missing ',' after minx"; @@ -117,8 +118,9 @@ GeoLocationParser::parseOldFormat(const std::string &locStr) return false; } foundLoc = true; - if (!getDimensionality(p)) + if (!correctDimensionalitySkip(p)) { return false; + } _x = getInt(p); if (*p != ',') { _parseError = "Missing ',' after x position"; diff --git a/searchlib/src/vespa/searchlib/common/geo_location_parser.h b/searchlib/src/vespa/searchlib/common/geo_location_parser.h index a9bd152b090..8936a620d21 100644 --- a/searchlib/src/vespa/searchlib/common/geo_location_parser.h +++ b/searchlib/src/vespa/searchlib/common/geo_location_parser.h @@ -41,7 +41,7 @@ private: int32_t _max_y; /* Max Y coordinate */ const char *_parseError; - bool getDimensionality(const char * &p); + bool correctDimensionalitySkip(const char * &p); }; } // namespace |