From d7a98e76551da7cf3e156c47aa7756532b1818fb Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Tue, 8 Jul 2014 20:21:15 -0700 Subject: [PATCH] CheckNameFilter converted to string --- common/database.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index ad16b6d0a..e006ae986 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1127,7 +1127,6 @@ uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){ bool Database::CheckNameFilter(const char* name, bool surname) { std::string str_name = name; - char *query = nullptr; if(surname) { @@ -1178,16 +1177,16 @@ bool Database::CheckNameFilter(const char* name, bool surname) } } - auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT name FROM name_filter")); + + std::string query("SELECT name FROM name_filter"); + auto results = QueryDatabase(query); if (!results.Success()) { std::cerr << "Error in CheckNameFilter query '" << query << "' " << results.ErrorMessage() << std::endl; - safe_delete_array(query); // false through to true? shouldn't it be falls through to false? return true; } - safe_delete_array(query); for (auto row = results.begin();row != results.end();++row) {