From ab70427b7d1bb307ecc1187f8b1fd3c6be5d5f05 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Mon, 18 Aug 2014 18:36:08 -0700 Subject: [PATCH] DeleteStaticZone converted to QueryDatabase --- world/EQLConfig.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/world/EQLConfig.cpp b/world/EQLConfig.cpp index bf15dc587..4597ff5a1 100644 --- a/world/EQLConfig.cpp +++ b/world/EQLConfig.cpp @@ -240,13 +240,9 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) { if(res == m_zones.end()) { //not found. LogFile->write(EQEMuLog::Error, "Update for unknown zone %s", short_name); - return(false); + return false; } - //database update - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; @@ -254,14 +250,13 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) { database.DoEscapeString(zonebuf, short_name, strlen(short_name)&0xF); //limit len to 16 zonebuf[31] = '\0'; - if (!database.RunQuery(query, MakeAnyLenString(&query, - "DELETE FROM launcher_zones WHERE launcher='%s' AND zone='%s'", - namebuf, zonebuf), errbuf)) { - LogFile->write(EQEMuLog::Error, "Error in DeleteStaticZone query: %s", errbuf); - safe_delete_array(query); + std::string query = StringFormat("DELETE FROM launcher_zones WHERE " + "launcher = '%s' AND zone = '%s'", namebuf, zonebuf); + auto results = database.QueryDatabase(query); + if (!results.Success()) { + LogFile->write(EQEMuLog::Error, "Error in DeleteStaticZone query: %s", results.ErrorMessage().c_str()); return false; } - safe_delete_array(query); //internal update. m_zones.erase(res);