From 4541bd536958b2ad5702078fd1c60deba831ff0e Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Sun, 6 Jul 2014 13:59:32 -0700
Subject: [PATCH] ZoneIDFromInstanceID converted to QueryDatabase

---
 common/database.cpp | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/common/database.cpp b/common/database.cpp
index 38dbbf1f3..b6042cdd1 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -2213,35 +2213,20 @@ bool Database::CheckInstanceExpired(uint16 instance_id)
 
 uint32 Database::ZoneIDFromInstanceID(uint16 instance_id)
 {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	uint32 ret;
+	char *query = nullptr;
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT zone FROM instance_list where id=%u", instance_id),
-		errbuf, &result))
-	{
-		safe_delete_array(query);
-		if (mysql_num_rows(result) != 0)
-		{
-			row = mysql_fetch_row(result);
-			ret = atoi(row[0]);
-			mysql_free_result(result);
-			return ret;
-		}
-		else
-		{
-			mysql_free_result(result);
-			return 0;
-		}
-	}
-	else
-	{
-		safe_delete_array(query);
+	auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT zone FROM instance_list where id=%u", instance_id));
+	safe_delete_array(query);
+
+	if (!results.Success())
 		return 0;
-	}
-	return 0;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+
+	return atoi(row[0]);
 }
 
 uint32 Database::VersionFromInstanceID(uint16 instance_id)