From 6d0f0bf5fa432ae970a69aef44e9379e63a9ec23 Mon Sep 17 00:00:00 2001 From: Naios Date: Thu, 2 Apr 2015 21:32:58 +0200 Subject: Core/Database: Remove va_args from DatabaseWorker::Execute methods. * Also delegate SQLQueryHolder::SetPQuery into SetQuery. (cherry picked from commit df4723af25900b3638a2b5921cf67e1838cbaf64) Conflicts: src/server/shared/Database/QueryHolder.h --- src/server/shared/Database/QueryHolder.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/server/shared/Database/QueryHolder.cpp') diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp index 75b96e1996c..2fdb3825526 100644 --- a/src/server/shared/Database/QueryHolder.cpp +++ b/src/server/shared/Database/QueryHolder.cpp @@ -40,29 +40,6 @@ bool SQLQueryHolder::SetQuery(size_t index, const char *sql) return true; } -bool SQLQueryHolder::SetPQuery(size_t index, const char *format, ...) -{ - if (!format) - { - TC_LOG_ERROR("sql.sql", "Query (index: %u) is empty.", uint32(index)); - return false; - } - - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, format); - int res = vsnprintf(szQuery, MAX_QUERY_LEN, format, ap); - va_end(ap); - - if (res == -1) - { - TC_LOG_ERROR("sql.sql", "SQL Query truncated (and not execute) for format: %s", format); - return false; - } - - return SetQuery(index, szQuery); -} - bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatement* stmt) { if (m_queries.size() <= index) -- cgit v1.2.3