diff options
| author | Spp- <u84280@epreinf21.(none)> | 2011-07-29 14:18:28 +0200 |
|---|---|---|
| committer | Spp- <u84280@epreinf21.(none)> | 2011-07-29 14:18:28 +0200 |
| commit | e47b96af3e3a41eae71e3e3da7eeee8bd3de86bc (patch) | |
| tree | 07d5ff1e6e39d792dbe1a89cc373c06702817787 /src/server/shared | |
| parent | 06b46ba203d30cc5e2abc9741b2fc737ebdd7c38 (diff) | |
Core: Append single character to stream as character, not as a string
Diffstat (limited to 'src/server/shared')
| -rwxr-xr-x | src/server/shared/Database/PreparedStatement.cpp | 6 | ||||
| -rwxr-xr-x | src/server/shared/Logging/Log.cpp | 4 | ||||
| -rwxr-xr-x | src/server/shared/Utilities/Util.cpp | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index 343976c3ffa..22ca31fc20a 100755 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -340,12 +340,12 @@ std::string MySQLPreparedStatement::getQueryString(const char *query) pos = queryString.find("?", pos); std::stringstream replace; - replace << "'"; + replace << '\''; switch (m_stmt->statement_data[i].type) { case TYPE_BOOL: - replace << (m_stmt->statement_data[i].data.boolean ? "1" : "0"); + replace << (m_stmt->statement_data[i].data.boolean ? '1' : '0'); break; case TYPE_UI8: case TYPE_UI16: @@ -373,7 +373,7 @@ std::string MySQLPreparedStatement::getQueryString(const char *query) replace << m_stmt->statement_data[i].str; break; } - replace << "'"; + replace << '\''; queryString.replace(pos, 1, replace.str()); } diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index ac74f893d58..b1318bf4aef 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -120,7 +120,7 @@ void Log::Initialize() m_logsDir = sConfig->GetStringDefault("LogsDir", ""); if (!m_logsDir.empty()) if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\')) - m_logsDir.append("/"); + m_logsDir.push_back('/'); m_logsTimestamp = "_" + GetTimestampStr(); @@ -183,7 +183,7 @@ void Log::Initialize() m_dumpsDir = sConfig->GetStringDefault("CharLogDump.SeparateDir", ""); if (!m_dumpsDir.empty()) if ((m_dumpsDir.at(m_dumpsDir.length() - 1) != '/') && (m_dumpsDir.at(m_dumpsDir.length() - 1) != '\\')) - m_dumpsDir.append("/"); + m_dumpsDir.push_back('/'); } } diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 3cea21f7928..47e18943f75 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -182,7 +182,7 @@ uint32 TimeStringToSecs(const std::string& timestring) uint32 buffer = 0; uint32 multiplier = 0; - for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); itr++ ) + for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr) { if(isdigit(*itr)) { @@ -318,11 +318,11 @@ bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr) { try { - size_t len = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); - wstr.resize(len); - - if (len) + if (size_t len = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size())) + { + wstr.resize(len); utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), &wstr[0]); + } } catch(std::exception) { |
