From 3a2ceab58a4f38cc88b9c0596f7e222f0474faeb Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Tue, 8 Jul 2014 20:46:41 -0700 Subject: [PATCH] CopyCharacter converted to StringFormat --- common/database.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 49d1775d2..be87fedf9 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1366,19 +1366,18 @@ bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) { } uint8 Database::CopyCharacter(const char* oldname, const char* newname, uint32 acctid) { - char *query = nullptr; + PlayerProfile_Struct* pp; ExtendedProfile_Struct* ext; - auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT profile, extprofile FROM character_ WHERE name='%s'", oldname)); + std::string query = StringFormat("SELECT profile, extprofile FROM character_ WHERE name='%s'", oldname); + auto results = QueryDatabase(query); if (!results.Success()) { std::cerr << "Error in CopyCharacter read query '" << query << "' " << results.ErrorMessage() << std::endl; - safe_delete_array(query); return 0; } - safe_delete_array(query); auto row = results.begin(); @@ -1387,7 +1386,6 @@ uint8 Database::CopyCharacter(const char* oldname, const char* newname, uint32 a ext = (ExtendedProfile_Struct*)row[1]; - char query2[276 + sizeof(PlayerProfile_Struct)*2 + sizeof(ExtendedProfile_Struct)*2 + 1]; char* end=query2;