From cf8cfd8b17a67020f1953d0233876a54700d5570 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Thu, 3 Jul 2014 19:15:43 -0700 Subject: [PATCH] UpdateName converted to QueryDatabase --- common/database.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 43cb2bd58..77af6c5b6 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1415,21 +1415,18 @@ void Database::ClearMerchantTemp(){ } bool Database::UpdateName(const char* oldname, const char* newname) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - uint32 affected_rows = 0; + char *query = nullptr; std::cout << "Renaming " << oldname << " to " << newname << "..." << std::endl; - if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET name='%s' WHERE name='%s';", newname, oldname), errbuf, 0, &affected_rows)) { - safe_delete_array(query); - return false; - } + + auto results = QueryDatabase(query, MakeAnyLenString(&query, "UPDATE character_ SET name='%s' WHERE name='%s';", newname, oldname)); safe_delete_array(query); - if (affected_rows == 0) - { + if (!results.Success()) + return false; + + if (results.RowsAffected() == 0) return false; - } return true; }