From 34f051ab9a5c3b2bd64100900a42ff8fa985f861 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Mon, 18 Aug 2014 16:13:11 -0700 Subject: [PATCH] ListBugs converted to QueryDatabase --- world/EQW.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/world/EQW.cpp b/world/EQW.cpp index 2fa36ec49..b15189730 100644 --- a/world/EQW.cpp +++ b/world/EQW.cpp @@ -398,18 +398,15 @@ int EQW::CountBugs() { std::vector EQW::ListBugs(uint32 offset) { std::vector res; - char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES *result; - MYSQL_ROW row; - if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM bugs WHERE status = 0 limit %d, 30", offset), errbuf, &result)) { - safe_delete_array(query); - while((row = mysql_fetch_row(result))) { - res.push_back(row[0]); - } - mysql_free_result(result); - } - safe_delete_array(query); + std::string query = StringFormat("SELECT id FROM bugs WHERE status = 0 limit %d, 30", offset); + auto results = database.QueryDatabase(query); + + if (!results.Success()) + return res; + + for (auto row = results.begin();row != results.end(); ++row) + res.push_back(row[0]); + return res; }