From ea0c8f86fee102ec8135cbc3ed979b2bb909b13e Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Sun, 17 Aug 2014 12:21:57 -0700 Subject: [PATCH] GetEntireGuild converted to QueryDatabase --- common/guild_base.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/common/guild_base.cpp b/common/guild_base.cpp index 023330e6b..55efab95e 100644 --- a/common/guild_base.cpp +++ b/common/guild_base.cpp @@ -930,31 +930,23 @@ bool BaseGuildManager::GetEntireGuild(uint32 guild_id, std::vectorRunQuery(query, MakeAnyLenString(&query, - GuildMemberBaseQuery " WHERE g.guild_id=%d", guild_id - ), errbuf, &result)) { - _log(GUILDS__ERROR, "Error loading guild member list '%s': %s", query, errbuf); - safe_delete_array(query); - return(false); + std::string query = StringFormat(GuildMemberBaseQuery " WHERE g.guild_id=%d", guild_id); + auto results = m_db->QueryDatabase(query); + if (!results.Success()) { + _log(GUILDS__ERROR, "Error loading guild member list '%s': %s", query.c_str(), results.ErrorMessage().c_str()); + return false; } - safe_delete_array(query); - while ((row = mysql_fetch_row(result))) { + for (auto row = results.begin(); row != results.end(); ++row) { CharGuildInfo *ci = new CharGuildInfo; ProcessGuildMember(row, *ci); members.push_back(ci); } - mysql_free_result(result); _log(GUILDS__DB, "Retreived entire guild member list for guild %d from the database", guild_id); - return(true); + return true; } bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) {