From 553d12412b717064eaebbdefce1a3d36fd784b16 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Sun, 17 Aug 2014 11:50:10 -0700 Subject: [PATCH] DBSetGuildChannel converted to QueryDatabase --- common/guild_base.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/common/guild_base.cpp b/common/guild_base.cpp index 9be8b797e..d87c1714f 100644 --- a/common/guild_base.cpp +++ b/common/guild_base.cpp @@ -712,33 +712,27 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel) if(m_db == nullptr) return(false); - std::map::const_iterator res; - - res = m_guilds.find(GuildID); + auto res = m_guilds.find(GuildID); if(res == m_guilds.end()) return(false); GuildInfo *info = res->second; - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - //escape our strings. uint32 len = strlen(Channel); - char *esc = new char[len*2+1]; - m_db->DoEscapeString(esc, Channel, len); - if (!m_db->RunQuery(query, MakeAnyLenString(&query, "UPDATE guilds SET channel='%s' WHERE id=%d", esc, GuildID), errbuf)) + std::string query = StringFormat("UPDATE guilds SET channel='%s' WHERE id=%d", esc, GuildID); + auto results = m_db->QueryDatabase(query); + + if (!results.Success()) { - _log(GUILDS__ERROR, "Error setting Channel for guild %d '%s': %s", GuildID, query, errbuf); - safe_delete_array(query); + _log(GUILDS__ERROR, "Error setting Channel for guild %d '%s': %s", GuildID, query.c_str(), results.ErrorMessage().c_str()); safe_delete_array(esc); return(false); } - safe_delete_array(query); safe_delete_array(esc); _log(GUILDS__DB, "Set Channel for guild %d in the database", GuildID);