From e66b4e4a3d2b00dca08916a3ef56ef19b2d1af22 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Thu, 10 Jul 2014 17:49:13 -0700 Subject: [PATCH] GetCharactersInInstance converted to StringFormat --- common/database.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 9c22e5f61..609ea231e 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -2312,17 +2312,15 @@ uint16 Database::GetInstanceID(uint32 zone, uint32 charid, int16 version) } void Database::GetCharactersInInstance(uint16 instance_id, std::list &charid_list) { - char *query = nullptr; - auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT charid FROM instance_list_player WHERE id=%u", instance_id)); + std::string query = StringFormat("SELECT charid FROM instance_list_player WHERE id=%u", instance_id); + auto results = QueryDatabase(query); if (!results.Success()) { - LogFile->write(EQEMuLog::Error, "Error in GetCharactersInInstace query '%s': %s", query, results.ErrorMessage().c_str()); - safe_delete_array(query); + LogFile->write(EQEMuLog::Error, "Error in GetCharactersInInstace query '%s': %s", query.c_str(), results.ErrorMessage().c_str()); return; } - safe_delete_array(query); for(auto row=results.begin();row != results.end();++row) charid_list.push_back(atoi(row[0]));