OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Merge pull request #464 from zrax/plString_fixes

Browse Source 
plString fixes
This commit is contained in:
Adam Johnson
2015-01-02 22:49:58 -05:00
parent b37307a7b4 c5f610e3b1
commit 6181cbc50e
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/CoreLib/plFormat.cpp
View File

@ -530,9 +530,7 @@ PL_FORMAT_IMPL(const std::string &)
PL_FORMAT_IMPL(const std::wstring &) PL_FORMAT_IMPL(const std::wstring &)
{ {
plStringBuffer<char> utf8 = plString::FromWchar(value.c_str()).ToUtf8(); PL_FORMAT_FORWARD(value.c_str());
_formatString(format, output, utf8.GetData(), utf8.GetSize(),
plFormat_Private::kAlignLeft);
} }
PL_FORMAT_IMPL(bool) PL_FORMAT_IMPL(bool)

2
Sources/Plasma/CoreLib/plString.cpp
View File

@ -838,7 +838,7 @@ std::vector<plString> plString::Split(const char *split, size_t maxSplits) const
plString plString::Fill(size_t count, char c) plString plString::Fill(size_t count, char c)
{ {
plStringBuffer<char> buf; plStringBuffer<char> buf;
char *data = buf.CreateWritableBuffer(count + 1); char *data = buf.CreateWritableBuffer(count);
memset(data, c, count); memset(data, c, count);
data[count] = 0; data[count] = 0;
return buf; return buf;

4
Sources/Plasma/CoreLib/plString.h
View File

@ -279,7 +279,7 @@ public:
* conversion from ISO-8859-1 8-bit data, use FromIso8859_1(). * conversion from ISO-8859-1 8-bit data, use FromIso8859_1().
*/ */
template <size_t _Sz> template <size_t _Sz>
plString(const char (&literal)[_Sz]) { IConvertFromUtf8(literal, _Sz); } plString(const char (&literal)[_Sz]) { IConvertFromUtf8(literal, _Sz - 1); }
/** Copy constructor. */ /** Copy constructor. */
plString(const plString &copy) : fUtf8Buffer(copy.fUtf8Buffer) { } plString(const plString &copy) : fUtf8Buffer(copy.fUtf8Buffer) { }
@ -304,7 +304,7 @@ public:
/** Assignment operator. Same as plString(const char (&)[_Sz]). */ /** Assignment operator. Same as plString(const char (&)[_Sz]). */
template <size_t _Sz> template <size_t _Sz>
plString &operator=(const char (&literal)[_Sz]) { IConvertFromUtf8(literal, _Sz); return *this; } plString &operator=(const char (&literal)[_Sz]) { IConvertFromUtf8(literal, _Sz - 1); return *this; }
/** Assignment operator. Same as plString(const plString &). */ /** Assignment operator. Same as plString(const plString &). */
plString &operator=(const plString &copy) { fUtf8Buffer = copy.fUtf8Buffer; return *this; } plString &operator=(const plString &copy) { fUtf8Buffer = copy.fUtf8Buffer; return *this; }