diff options
author | Naios <naios-dev@live.de> | 2015-03-28 19:10:21 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2015-04-02 22:55:54 +0200 |
commit | 3e5025b773a3b3ba84c15a6c9b16fb95861f208c (patch) | |
tree | d3be8431a84a975eff920fc676b3cabafdd87939 /src | |
parent | 6d0f0bf5fa432ae970a69aef44e9379e63a9ec23 (diff) |
Core/Database: Remove va_list from PreparedStatement::PAppend.
(cherry picked from commit 1939367108b50eb1de2bb0a9cc017eea6423cf29)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/shared/Database/Transaction.cpp | 11 | ||||
-rw-r--r-- | src/server/shared/Database/Transaction.h | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/server/shared/Database/Transaction.cpp b/src/server/shared/Database/Transaction.cpp index 9f36d198bde..f657411f716 100644 --- a/src/server/shared/Database/Transaction.cpp +++ b/src/server/shared/Database/Transaction.cpp @@ -30,17 +30,6 @@ void Transaction::Append(const char* sql) m_queries.push_back(data); } -void Transaction::PAppend(const char* sql, ...) -{ - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, sql); - vsnprintf(szQuery, MAX_QUERY_LEN, sql, ap); - va_end(ap); - - Append(szQuery); -} - //- Append a prepared statement to the transaction void Transaction::Append(PreparedStatement* stmt) { diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h index 83d59006ddc..43850b1d016 100644 --- a/src/server/shared/Database/Transaction.h +++ b/src/server/shared/Database/Transaction.h @@ -19,6 +19,7 @@ #define _TRANSACTION_H #include "SQLOperation.h" +#include "StringFormat.h" //- Forward declare (don't include header to prevent circular includes) class PreparedStatement; @@ -38,7 +39,8 @@ class Transaction void Append(PreparedStatement* statement); void Append(const char* sql); - void PAppend(const char* sql, ...); + template<typename... Args> + void PAppend(const char* sql, Args const&... args) { Append(Trinity::StringFormat(sql, args...).c_str()); } size_t GetSize() const { return m_queries.size(); } |