Merge pull request #1697 from rouault/cppcheck_fixes

Fixes/workaround to be able to use cppcheck from Ubuntu 16.04 (fixes #1648)

1 files changed, 11 insertions, 13 deletions

diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 6fef6366..e0a1b084 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -4379,19 +4379,17 @@ AuthorityFactory::createObjectsFromName(
                 const auto &listOfRow = pair.second;
                 for (const auto &row : listOfRow) {
                     const auto &name = row[3];
-                    if (approximateMatch) {
-                        bool match =
-                            ci_find(name, searchedNameWithoutDeprecated) !=
-                            std::string::npos;
-                        if (!match) {
-                            const auto &canonicalizedName(pair.first);
-                            match = ci_find(canonicalizedName,
-                                            canonicalizedSearchedName) !=
-                                    std::string::npos;
-                        }
-                        if (!match) {
-                            continue;
-                        }
+                    bool match =
+                        ci_find(name, searchedNameWithoutDeprecated) !=
+                        std::string::npos;
+                    if (!match) {
+                        const auto &canonicalizedName(pair.first);
+                        match = ci_find(canonicalizedName,
+                                        canonicalizedSearchedName) !=
+                                std::string::npos;
+                    }
+                    if (!match) {
+                        continue;
                     }
 
                     const auto &auth_name = row[1];