From 6132fa0cb99e58a4659f7221029b048b2bb6fd71 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Sat, 5 Jul 2014 17:03:46 -0700 Subject: [PATCH] GetAgreementFlag converted to QueryDatabase --- common/database.cpp | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 0bf5749d2..808f3db0b 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1965,26 +1965,20 @@ bool retval=false; uint8 Database::GetAgreementFlag(uint32 acctid) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES* result; - MYSQL_ROW row; + char* query = nullptr; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT rulesflag FROM account WHERE id=%i",acctid), errbuf, &result)) { - safe_delete_array(query); - if (mysql_num_rows(result) == 1) - { - row = mysql_fetch_row(result); - uint8 flag = atoi(row[0]); - mysql_free_result(result); - return flag; - } - } - else - { - safe_delete_array(query); - } - return 0; + auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT rulesflag FROM account WHERE id=%i",acctid)); + safe_delete_array(query); + + if (!results.Success()) + return 0; + + if (results.RowCount() != 1) + return 0; + + auto row = results.begin(); + + return atoi(row[0]); } void Database::SetAgreementFlag(uint32 acctid)