DeleteStaticZone converted to QueryDatabase

This commit is contained in:
Arthur Ice 2014-08-18 18:36:08 -07:00
parent 0af394fb96
commit ab70427b7d

View File

@ -240,13 +240,9 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) {
if(res == m_zones.end()) { if(res == m_zones.end()) {
//not found. //not found.
LogFile->write(EQEMuLog::Error, "Update for unknown zone %s", short_name); 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]; char namebuf[128];
database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64
namebuf[127] = '\0'; 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 database.DoEscapeString(zonebuf, short_name, strlen(short_name)&0xF); //limit len to 16
zonebuf[31] = '\0'; zonebuf[31] = '\0';
if (!database.RunQuery(query, MakeAnyLenString(&query, std::string query = StringFormat("DELETE FROM launcher_zones WHERE "
"DELETE FROM launcher_zones WHERE launcher='%s' AND zone='%s'", "launcher = '%s' AND zone = '%s'", namebuf, zonebuf);
namebuf, zonebuf), errbuf)) { auto results = database.QueryDatabase(query);
LogFile->write(EQEMuLog::Error, "Error in DeleteStaticZone query: %s", errbuf); if (!results.Success()) {
safe_delete_array(query); LogFile->write(EQEMuLog::Error, "Error in DeleteStaticZone query: %s", results.ErrorMessage().c_str());
return false; return false;
} }
safe_delete_array(query);
//internal update. //internal update.
m_zones.erase(res); m_zones.erase(res);