From fb213e6ee58c3f59fb09286401c7382c73b70c15 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Thu, 10 Jul 2014 17:31:30 -0700 Subject: [PATCH] GetUnusedInstanceID converted to StringFormat --- common/database.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 2c668bf71..78895e9d7 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -2114,13 +2114,11 @@ uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma) bool Database::GetUnusedInstanceID(uint16 &instance_id) { - char *query = nullptr; - uint32 count = RuleI(Zone, ReservedInstances); uint32 max = 65535; - auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT IFNULL(MAX(id),%u)+1 FROM instance_list WHERE id > %u", count, count)); - safe_delete_array(query); + std::string query = StringFormat("SELECT IFNULL(MAX(id),%u)+1 FROM instance_list WHERE id > %u", count, count); + auto results = QueryDatabase(query); if (!results.Success()) { @@ -2142,8 +2140,8 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id) return true; } - results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT id FROM instance_list where id > %u ORDER BY id", count)); - safe_delete_array(query); + query = StringFormat("SELECT id FROM instance_list where id > %u ORDER BY id", count); + results = QueryDatabase(query); if (!results.Success()) {