OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Add Short-String Optimization to plString

Michael Hansen 12 years ago
parent
92c5070736
commit
9cc3f404af
11 changed files with 148 additions and 163 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Sources/Plasma/Apps/plClient/winmain.cpp
  2. 151
      Sources/Plasma/CoreLib/plString.cpp
  3. 115
      Sources/Plasma/CoreLib/plString.h
  4. 4
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
  5. 2
      Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp
  6. 4
      Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h
  7. 6
      Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp
  8. 2
      Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp
  9. 8
      Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
  10. 2
      Sources/Tools/MaxConvert/hsMaterialConverter.cpp
  11. 2
      Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp

5
Sources/Plasma/Apps/plClient/winmain.cpp
Unescape View File

@ -968,8 +968,9 @@ BOOL CALLBACK UruTOSDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
memset(eulaData, 0, dataLen + 1); memset(eulaData, 0, dataLen + 1);
stream.Read(dataLen, eulaData); stream.Read(dataLen, eulaData);
plString str = plString::Steal(eulaData); plString str = plString::FromUtf8(eulaData);
SetDlgItemTextW(hwndDlg, IDC_URULOGIN_EULATEXT, _TEMP_CONVERT_TO_WCHAR_T(str)); delete [] eulaData;
SetDlgItemTextW(hwndDlg, IDC_URULOGIN_EULATEXT, str.ToWchar());
} }
else // no TOS found, go ahead else // no TOS found, go ahead
EndDialog(hwndDlg, true); EndDialog(hwndDlg, true);

151
Sources/Plasma/CoreLib/plString.cpp
Unescape View File

@ -83,7 +83,7 @@ size_t wcsnlen(const wchar_t *s, size_t maxlen)
#define BADCHAR_REPLACEMENT (0xFFFDul) #define BADCHAR_REPLACEMENT (0xFFFDul)
void plString::IConvertFromUtf8(const char *utf8, size_t size, bool steal) void plString::IConvertFromUtf8(const char *utf8, size_t size)
{ {
if (utf8 == nil) { if (utf8 == nil) {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
@ -118,16 +118,14 @@ void plString::IConvertFromUtf8(const char *utf8, size_t size, bool steal)
} }
#endif #endif
fUtf8Buffer = steal ? plStringBuffer<char>::Steal(utf8, size) fUtf8Buffer = plStringBuffer<char>(utf8, size);
: plStringBuffer<char>(utf8, size);
} }
void plString::IConvertFromUtf16(const uint16_t *utf16, size_t size) void plString::IConvertFromUtf16(const uint16_t *utf16, size_t size)
{ {
if (utf16 == nil) {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
if (utf16 == nil)
return; return;
}
if ((int32_t)size < 0) if ((int32_t)size < 0)
size = u16slen(utf16, -(int32_t)size); size = u16slen(utf16, -(int32_t)size);
@ -151,7 +149,7 @@ void plString::IConvertFromUtf16(const uint16_t *utf16, size_t size)
} }
// And perform the actual conversion // And perform the actual conversion
char *utf8 = new char[convlen + 1]; char *utf8 = fUtf8Buffer.CreateWritableBuffer(convlen);
char *dp = utf8; char *dp = utf8;
sp = utf16; sp = utf16;
while (sp < utf16 + size) { while (sp < utf16 + size) {
@ -190,8 +188,6 @@ void plString::IConvertFromUtf16(const uint16_t *utf16, size_t size)
++sp; ++sp;
} }
utf8[convlen] = 0; utf8[convlen] = 0;
fUtf8Buffer = plStringBuffer<char>::Steal(utf8, convlen);
} }
void plString::IConvertFromWchar(const wchar_t *wstr, size_t size) void plString::IConvertFromWchar(const wchar_t *wstr, size_t size)
@ -200,10 +196,9 @@ void plString::IConvertFromWchar(const wchar_t *wstr, size_t size)
// We assume that if sizeof(wchar_t) == 2, the data is UTF-16 already // We assume that if sizeof(wchar_t) == 2, the data is UTF-16 already
IConvertFromUtf16((const uint16_t *)wstr, size); IConvertFromUtf16((const uint16_t *)wstr, size);
#else #else
if (wstr == nil) {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
if (wstr == nil)
return; return;
}
if ((int32_t)size < 0) if ((int32_t)size < 0)
size = wcsnlen(wstr, -(int32_t)size); size = wcsnlen(wstr, -(int32_t)size);
@ -228,7 +223,7 @@ void plString::IConvertFromWchar(const wchar_t *wstr, size_t size)
} }
// And perform the actual conversion // And perform the actual conversion
char *utf8 = new char[convlen + 1]; char *utf8 = fUtf8Buffer.CreateWritableBuffer(convlen);
char *dp = utf8; char *dp = utf8;
sp = wstr; sp = wstr;
while (sp < wstr + size) { while (sp < wstr + size) {
@ -255,17 +250,14 @@ void plString::IConvertFromWchar(const wchar_t *wstr, size_t size)
++sp; ++sp;
} }
utf8[convlen] = 0; utf8[convlen] = 0;
fUtf8Buffer = plStringBuffer<char>::Steal(utf8, convlen);
#endif #endif
} }
void plString::IConvertFromIso8859_1(const char *astr, size_t size) void plString::IConvertFromIso8859_1(const char *astr, size_t size)
{ {
if (astr == nil) {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
if (astr == nil)
return; return;
}
if ((int32_t)size < 0) if ((int32_t)size < 0)
size = strnlen(astr, -(int32_t)size); size = strnlen(astr, -(int32_t)size);
@ -281,7 +273,7 @@ void plString::IConvertFromIso8859_1(const char *astr, size_t size)
} }
// And perform the actual conversion // And perform the actual conversion
char *utf8 = new char[convlen + 1]; char *utf8 = fUtf8Buffer.CreateWritableBuffer(convlen);
char *dp = utf8; char *dp = utf8;
sp = astr; sp = astr;
while (sp < astr + size) { while (sp < astr + size) {
@ -294,14 +286,13 @@ void plString::IConvertFromIso8859_1(const char *astr, size_t size)
++sp; ++sp;
} }
utf8[convlen] = 0; utf8[convlen] = 0;
fUtf8Buffer = plStringBuffer<char>::Steal(utf8, convlen);
} }
plStringBuffer<uint16_t> plString::ToUtf16() const plStringBuffer<uint16_t> plString::ToUtf16() const
{ {
if (IsNull()) plStringBuffer<uint16_t> result;
return plStringBuffer<uint16_t>(); if (IsEmpty())
return result;
// Calculate the UTF-16 size // Calculate the UTF-16 size
size_t convlen = 0; size_t convlen = 0;
@ -324,7 +315,7 @@ plStringBuffer<uint16_t> plString::ToUtf16() const
} }
// And perform the actual conversion // And perform the actual conversion
uint16_t *ustr = new uint16_t[convlen + 1]; uint16_t *ustr = result.CreateWritableBuffer(convlen);
uint16_t *dp = ustr; uint16_t *dp = ustr;
sp = utf8; sp = utf8;
while (sp < utf8 + srcSize) { while (sp < utf8 + srcSize) {
@ -352,7 +343,7 @@ plStringBuffer<uint16_t> plString::ToUtf16() const
} }
ustr[convlen] = 0; ustr[convlen] = 0;
return plStringBuffer<uint16_t>::Steal(ustr, convlen); return result;
} }
plStringBuffer<wchar_t> plString::ToWchar() const plStringBuffer<wchar_t> plString::ToWchar() const
@ -362,8 +353,9 @@ plStringBuffer<wchar_t> plString::ToWchar() const
plStringBuffer<uint16_t> utf16 = ToUtf16(); plStringBuffer<uint16_t> utf16 = ToUtf16();
return *reinterpret_cast<plStringBuffer<wchar_t>*>(&utf16); return *reinterpret_cast<plStringBuffer<wchar_t>*>(&utf16);
#else #else
if (IsNull()) plStringBuffer<uint16_t> result;
return plStringBuffer<wchar_t>(); if (IsEmpty())
return result;
// Calculate the UCS-4 size // Calculate the UCS-4 size
size_t convlen = 0; size_t convlen = 0;
@ -383,7 +375,7 @@ plStringBuffer<wchar_t> plString::ToWchar() const
} }
// And perform the actual conversion // And perform the actual conversion
wchar_t *wstr = new wchar_t[convlen + 1]; wchar_t *wstr = result.CreateWritableBuffer(convlen);
wchar_t *dp = wstr; wchar_t *dp = wstr;
sp = utf8; sp = utf8;
while (sp < utf8 + srcSize) { while (sp < utf8 + srcSize) {
@ -407,14 +399,15 @@ plStringBuffer<wchar_t> plString::ToWchar() const
} }
wstr[convlen] = 0; wstr[convlen] = 0;
return plStringBuffer<wchar_t>::Steal(wstr, convlen); return result;
#endif #endif
} }
plStringBuffer<char> plString::ToIso8859_1() const plStringBuffer<char> plString::ToIso8859_1() const
{ {
if (IsNull()) plStringBuffer<char> result;
return plStringBuffer<char>(); if (IsEmpty())
return result;
// Calculate the ASCII size // Calculate the ASCII size
size_t convlen = 0; size_t convlen = 0;
@ -434,7 +427,7 @@ plStringBuffer<char> plString::ToIso8859_1() const
} }
// And perform the actual conversion // And perform the actual conversion
char *astr = new char[convlen + 1]; char *astr = result.CreateWritableBuffer(convlen);
char *dp = astr; char *dp = astr;
sp = utf8; sp = utf8;
while (sp < utf8 + srcSize) { while (sp < utf8 + srcSize) {
@ -458,45 +451,45 @@ plStringBuffer<char> plString::ToIso8859_1() const
} }
astr[convlen] = 0; astr[convlen] = 0;
return plStringBuffer<char>::Steal(astr, convlen); return result;
} }
plStringBuffer<UniChar> plString::GetUnicodeArray() const plStringBuffer<UniChar> plString::GetUnicodeArray() const
{ {
static UniChar empty[1] = {0}; plStringBuffer<UniChar> result;
if (IsEmpty())
if (IsNull()) return result;
return plStringBuffer<UniChar>(empty, 0);
size_t convlen = GetUniCharCount(); size_t convlen = GetUniCharCount();
UniChar *ustr = new UniChar[convlen + 1]; UniChar *ustr = result.CreateWritableBuffer(convlen);
iterator iter = GetIterator(); iterator iter = GetIterator();
size_t dp = 0; size_t dp = 0;
while (!iter.AtEnd()) while (!iter.AtEnd())
ustr[dp++] = *iter++; ustr[dp++] = *iter++;
ustr[convlen] = 0; ustr[convlen] = 0;
return plStringBuffer<UniChar>::Steal(ustr, convlen);
return result;
} }
int plString::ToInt(int base) const int plString::ToInt(int base) const
{ {
return static_cast<int>(strtol(s_str(), nil, base)); return static_cast<int>(strtol(c_str(), nil, base));
} }
unsigned int plString::ToUInt(int base) const unsigned int plString::ToUInt(int base) const
{ {
return static_cast<unsigned int>(strtoul(s_str(), nil, base)); return static_cast<unsigned int>(strtoul(c_str(), nil, base));
} }
float plString::ToFloat() const float plString::ToFloat() const
{ {
// strtof is C99, which MS doesn't support... // strtof is C99, which MS doesn't support...
return (float)strtod(s_str(), nil); return (float)strtod(c_str(), nil);
} }
double plString::ToDouble() const double plString::ToDouble() const
{ {
return strtod(s_str(), nil); return strtod(c_str(), nil);
} }
// Microsoft doesn't provide this for us // Microsoft doesn't provide this for us
@ -517,22 +510,21 @@ plString plString::IFormat(const char *fmt, va_list vptr)
int size = 4096; int size = 4096;
for ( ;; ) { for ( ;; ) {
va_copy(vptr, vptr_save); va_copy(vptr, vptr_save);
char *bigbuffer = new char[size]; std::auto_ptr<char> bigbuffer(new char[size]);
chars = vsnprintf(bigbuffer, size, fmt, vptr); chars = vsnprintf(bigbuffer.get(), size, fmt, vptr);
if (chars >= 0) if (chars >= 0)
return plString::Steal(bigbuffer); return plString::FromUtf8(bigbuffer.get(), chars);
delete [] bigbuffer;
size *= 2; size *= 2;
} }
} else if (chars >= 256) { } else if (chars >= 256) {
va_copy(vptr, vptr_save); va_copy(vptr, vptr_save);
char *bigbuffer = new char[chars+1]; std::auto_ptr<char> bigbuffer(new char[chars+1]);
vsnprintf(bigbuffer, chars+1, fmt, vptr); vsnprintf(bigbuffer.get(), chars+1, fmt, vptr);
return plString::Steal(bigbuffer); return plString::FromUtf8(bigbuffer.get(), chars);
} }
return plString::FromUtf8(buffer); return plString::FromUtf8(buffer, chars);
} }
plString plString::Format(const char *fmt, ...) plString plString::Format(const char *fmt, ...)
@ -547,11 +539,10 @@ plString plString::Format(const char *fmt, ...)
int plString::Find(char ch, CaseSensitivity sense) const int plString::Find(char ch, CaseSensitivity sense) const
{ {
if (sense == kCaseSensitive) { if (sense == kCaseSensitive) {
const char *cp = strchr(s_str(), ch); const char *cp = strchr(c_str(), ch);
return cp ? (cp - c_str()) : -1; return cp ? (cp - c_str()) : -1;
} else { } else {
// No need to check for null, since s_str() will return { 0 } if it is null const char *cp = c_str();
const char *cp = s_str();
while (*cp) { while (*cp) {
if (tolower(*cp) == tolower(ch)) if (tolower(*cp) == tolower(ch))
return cp - c_str(); return cp - c_str();
@ -566,7 +557,7 @@ int plString::FindLast(char ch, CaseSensitivity sense) const
return -1; return -1;
if (sense == kCaseSensitive) { if (sense == kCaseSensitive) {
const char *cp = strrchr(s_str(), ch); const char *cp = strrchr(c_str(), ch);
return cp ? (cp - c_str()) : -1; return cp ? (cp - c_str()) : -1;
} else { } else {
const char *cp = c_str(); const char *cp = c_str();
@ -586,7 +577,7 @@ int plString::Find(const char *str, CaseSensitivity sense) const
return -1; return -1;
if (sense == kCaseSensitive) { if (sense == kCaseSensitive) {
const char *cp = strstr(s_str(), str); const char *cp = strstr(c_str(), str);
return cp ? (cp - c_str()) : -1; return cp ? (cp - c_str()) : -1;
} else { } else {
// The easy way // The easy way
@ -667,69 +658,49 @@ plString plString::Substr(int start, size_t size) const
if (start == 0 && size == maxSize) if (start == 0 && size == maxSize)
return *this; return *this;
char *substr = new char[size + 1]; plString sub;
char *substr = sub.fUtf8Buffer.CreateWritableBuffer(size);
memcpy(substr, c_str() + start, size); memcpy(substr, c_str() + start, size);
substr[size] = 0; substr[size] = 0;
// Don't re-check UTF-8 on this return sub;
plString str;
str.fUtf8Buffer = plStringBuffer<char>::Steal(substr, size);
return str;
} }
plString plString::ToUpper() const plString plString::ToUpper() const
{ {
// TODO: Unicode-aware case conversion // TODO: Unicode-aware case conversion
size_t size = GetSize(); plString str;
char *dupe = new char[size + 1]; char *dupe = str.fUtf8Buffer.CreateWritableBuffer(fUtf8Buffer.GetSize());
const char *self = c_str(); const char *self = c_str();
for (size_t i = 0; i < size; ++i) for (size_t i = 0; i < fUtf8Buffer.GetSize(); ++i)
dupe[i] = toupper(self[i]); dupe[i] = toupper(self[i]);
dupe[fUtf8Buffer.GetSize()] = 0;
// Don't re-check UTF-8 on this
plString str;
str.fUtf8Buffer = plStringBuffer<char>::Steal(dupe, size);
return str; return str;
} }
plString plString::ToLower() const plString plString::ToLower() const
{ {
// TODO: Unicode-aware case conversion // TODO: Unicode-aware case conversion
size_t size = GetSize(); plString str;
char *dupe = new char[size + 1]; char *dupe = str.fUtf8Buffer.CreateWritableBuffer(fUtf8Buffer.GetSize());
const char *self = c_str(); const char *self = c_str();
for (size_t i = 0; i < size; ++i) for (size_t i = 0; i < fUtf8Buffer.GetSize(); ++i)
dupe[i] = tolower(self[i]); dupe[i] = tolower(self[i]);
dupe[fUtf8Buffer.GetSize()] = 0;
// Don't re-check UTF-8 on this
plString str;
str.fUtf8Buffer = plStringBuffer<char>::Steal(dupe, size);
return str; return str;
} }
plString &plString::operator+=(const plString &str)
{
size_t catsize = GetSize() + str.GetSize();
char *catstr = new char[catsize + 1];
memcpy(catstr, s_str(), GetSize());
memcpy(catstr + GetSize(), str.s_str(), str.GetSize());
catstr[catsize] = 0;
fUtf8Buffer = plStringBuffer<char>::Steal(catstr, catsize);
return *this;
}
plString operator+(const plString &left, const plString &right) plString operator+(const plString &left, const plString &right)
{ {
size_t catsize = left.GetSize() + right.GetSize(); plString cat;
char *catstr = new char[catsize + 1]; char *catstr = cat.fUtf8Buffer.CreateWritableBuffer(left.GetSize() + right.GetSize());
memcpy(catstr, left.s_str(), left.GetSize()); memcpy(catstr, left.c_str(), left.GetSize());
memcpy(catstr + left.GetSize(), right.s_str(), right.GetSize()); memcpy(catstr + left.GetSize(), right.c_str(), right.GetSize());
catstr[catsize] = 0; catstr[cat.fUtf8Buffer.GetSize()] = 0;
// Don't re-check UTF-8 on this return cat;
plString str;
str.fUtf8Buffer = plStringBuffer<char>::Steal(catstr, catsize);
return str;
} }
plStringStream &plStringStream::append(const char *data, size_t length) plStringStream &plStringStream::append(const char *data, size_t length)

115
Sources/Plasma/CoreLib/plString.h
Unescape View File

@ -59,6 +59,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
typedef unsigned int UniChar; typedef unsigned int UniChar;
#define SSO_CHARS (16)
template <typename _Ch> template <typename _Ch>
class plStringBuffer class plStringBuffer
{ {
@ -67,10 +69,9 @@ private:
{ {
unsigned int fRefs; unsigned int fRefs;
const _Ch *fStringData; const _Ch *fStringData;
const size_t fSize;
StringRef(const _Ch *data, const size_t size) StringRef(const _Ch *data)
: fRefs(1), fStringData(data), fSize(size) { } : fRefs(1), fStringData(data) { }
inline void AddRef() { ++fRefs; } inline void AddRef() { ++fRefs; }
inline void DecRef() inline void DecRef()
@ -82,54 +83,74 @@ private:
} }
}; };
union {
StringRef *fData; StringRef *fData;
_Ch fShort[SSO_CHARS];
};
size_t fSize;
bool IHaveACow() const { return fSize >= SSO_CHARS; }
public: public:
plStringBuffer() : fData(nil) { } plStringBuffer() : fSize(0) { memset(fShort, 0, sizeof(fShort)); }
plStringBuffer(const plStringBuffer<_Ch> &copy) plStringBuffer(const plStringBuffer<_Ch> &copy) : fSize(copy.fSize)
{ {
fData = copy.fData; memcpy(fShort, copy.fShort, sizeof(fShort));
if (fData) if (IHaveACow())
fData->AddRef(); fData->AddRef();
} }
plStringBuffer(const _Ch *data, size_t size) plStringBuffer(const _Ch *data, size_t size) : fSize(size)
{ {
_Ch *copyData = new _Ch[size + 1]; memset(fShort, 0, sizeof(fShort));
_Ch *copyData = IHaveACow() ? new _Ch[size + 1] : fShort;
memcpy(copyData, data, size); memcpy(copyData, data, size);
copyData[size] = 0; copyData[size] = 0;
fData = new StringRef(copyData, size); if (IHaveACow())
fData = new StringRef(copyData);
} }
~plStringBuffer<_Ch>() ~plStringBuffer<_Ch>()
{ {
if (fData) if (IHaveACow())
fData->DecRef(); fData->DecRef();
} }
static plStringBuffer<_Ch> Steal(const _Ch *data, size_t size)
{
plStringBuffer<_Ch> string;
string.fData = new StringRef(data, size);
return string;
}
plStringBuffer<_Ch> &operator=(const plStringBuffer<_Ch> &copy) plStringBuffer<_Ch> &operator=(const plStringBuffer<_Ch> &copy)
{ {
if (copy.fData) if (copy.IHaveACow())
copy.fData->AddRef(); copy.fData->AddRef();
if (fData) if (IHaveACow())
fData->DecRef(); fData->DecRef();
fData = copy.fData;
memcpy(fShort, copy.fShort, sizeof(fShort));
fSize = copy.fSize;
return *this; return *this;
} }
const _Ch *GetData() const { return fData ? fData->fStringData : 0; } const _Ch *GetData() const { return IHaveACow() ? fData->fStringData : fShort; }
size_t GetSize() const { return fData ? fData->fSize : 0; } size_t GetSize() const { return fSize; }
operator const _Ch *() const { return GetData(); } operator const _Ch *() const { return GetData(); }
// From Haxxia with love
// NOTE: The client is expected to nul-terminate the returned buffer!
_Ch *CreateWritableBuffer(size_t size)
{
if (IHaveACow())
fData->DecRef();
fSize = size;
if (IHaveACow()) {
_Ch *writable = new _Ch[fSize + 1];
fData = new StringRef(writable);
return writable;
} else {
return fShort;
}
}
}; };
@ -145,7 +166,7 @@ public:
private: private:
plStringBuffer<char> fUtf8Buffer; plStringBuffer<char> fUtf8Buffer;
void IConvertFromUtf8(const char *utf8, size_t size, bool steal); void IConvertFromUtf8(const char *utf8, size_t size);
void IConvertFromUtf16(const uint16_t *utf16, size_t size); void IConvertFromUtf16(const uint16_t *utf16, size_t size);
void IConvertFromWchar(const wchar_t *wstr, size_t size); void IConvertFromWchar(const wchar_t *wstr, size_t size);
void IConvertFromIso8859_1(const char *astr, size_t size); void IConvertFromIso8859_1(const char *astr, size_t size);
@ -161,12 +182,12 @@ public:
//plString &operator=(const wchar_t *wstr) { IConvertFromWchar(wstr, kSizeAuto); return *this; } //plString &operator=(const wchar_t *wstr) { IConvertFromWchar(wstr, kSizeAuto); return *this; }
plString &operator=(const plString &copy) { fUtf8Buffer = copy.fUtf8Buffer; return *this; } plString &operator=(const plString &copy) { fUtf8Buffer = copy.fUtf8Buffer; return *this; }
plString &operator+=(const plString &str); plString &operator+=(const plString &str) { return operator=(*this + str); }
static inline plString FromUtf8(const char *utf8, size_t size = kSizeAuto) static inline plString FromUtf8(const char *utf8, size_t size = kSizeAuto)
{ {
plString str; plString str;
str.IConvertFromUtf8(utf8, size, false); str.IConvertFromUtf8(utf8, size);
return str; return str;
} }
@ -191,8 +212,9 @@ public:
return str; return str;
} }
const char *c_str() const { return fUtf8Buffer.GetData(); } const char *c_str(const char *substitute = "") const
const char *s_str(const char *safe = "") const { return c_str() ? c_str() : safe; } { return IsEmpty() ? substitute : fUtf8Buffer.GetData(); }
char CharAt(size_t position) const { return c_str()[position]; } char CharAt(size_t position) const { return c_str()[position]; }
plStringBuffer<char> ToUtf8() const { return fUtf8Buffer; } plStringBuffer<char> ToUtf8() const { return fUtf8Buffer; }
@ -205,7 +227,10 @@ public:
size_t GetSize() const { return fUtf8Buffer.GetSize(); } size_t GetSize() const { return fUtf8Buffer.GetSize(); }
bool IsEmpty() const { return fUtf8Buffer.GetSize() == 0; } bool IsEmpty() const { return fUtf8Buffer.GetSize() == 0; }
bool IsNull() const { return fUtf8Buffer.GetData() == 0; }
// TODO: Evaluate whether Plasma actually needs to distinguish between
// empty and NULL strings. Ideally, only IsEmpty should be required.
bool IsNull() const { return IsEmpty(); }
int ToInt(int base = 0) const; int ToInt(int base = 0) const;
unsigned int ToUInt(int base = 0) const; unsigned int ToUInt(int base = 0) const;
@ -214,12 +239,6 @@ public:
static plString Format(const char *fmt, ...); static plString Format(const char *fmt, ...);
static plString IFormat(const char *fmt, va_list vptr); static plString IFormat(const char *fmt, va_list vptr);
static plString Steal(const char *utf8, size_t size = kSizeAuto)
{
plString str;
str.IConvertFromUtf8(utf8, size, true);
return str;
}
enum CaseSensitivity { enum CaseSensitivity {
kCaseSensitive, kCaseInsensitive kCaseSensitive, kCaseInsensitive
@ -227,32 +246,26 @@ public:
int Compare(const plString &str, CaseSensitivity sense = kCaseSensitive) const int Compare(const plString &str, CaseSensitivity sense = kCaseSensitive) const
{ {
if (c_str() == str.c_str()) return (sense == kCaseSensitive) ? strcmp(c_str(), str.c_str())
return 0; : stricmp(c_str(), str.c_str());
return (sense == kCaseSensitive) ? strcmp(s_str(), str.s_str())
: stricmp(s_str(), str.s_str());
} }
int Compare(const char *str, CaseSensitivity sense = kCaseSensitive) const int Compare(const char *str, CaseSensitivity sense = kCaseSensitive) const
{ {
return (sense == kCaseSensitive) ? strcmp(s_str(), str) return (sense == kCaseSensitive) ? strcmp(c_str(), str)
: stricmp(s_str(), str); : stricmp(c_str(), str);
} }
int CompareN(const plString &str, size_t count, CaseSensitivity sense = kCaseSensitive) const int CompareN(const plString &str, size_t count, CaseSensitivity sense = kCaseSensitive) const
{ {
if (c_str() == str.c_str()) return (sense == kCaseSensitive) ? strncmp(c_str(), str.c_str(), count)
return 0; : strnicmp(c_str(), str.c_str(), count);
return (sense == kCaseSensitive) ? strncmp(s_str(), str.s_str(), count)
: strnicmp(s_str(), str.s_str(), count);
} }
int CompareN(const char *str, size_t count, CaseSensitivity sense = kCaseSensitive) const int CompareN(const char *str, size_t count, CaseSensitivity sense = kCaseSensitive) const
{ {
return (sense == kCaseSensitive) ? strncmp(s_str(), str, count) return (sense == kCaseSensitive) ? strncmp(c_str(), str, count)
: strnicmp(s_str(), str, count); : strnicmp(c_str(), str, count);
} }
bool operator<(const plString &other) const { return Compare(other) < 0; } bool operator<(const plString &other) const { return Compare(other) < 0; }
@ -393,7 +406,7 @@ public:
const char *m_end; const char *m_end;
}; };
iterator GetIterator() const { return iterator(s_str(), GetSize()); } iterator GetIterator() const { return iterator(c_str(), GetSize()); }
size_t GetUniCharCount() const size_t GetUniCharCount() const
{ {
@ -431,7 +444,7 @@ public:
plStringStream &operator<<(const plString &text) plStringStream &operator<<(const plString &text)
{ {
return append(text.s_str(), text.GetSize()); return append(text.c_str(), text.GetSize());
} }
size_t GetLength() const { return fLength; } size_t GetLength() const { return fLength; }

4
Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
Unescape View File

@ -334,7 +334,7 @@ bool pfConsole::MsgReceive( plMessage *msg )
case kSrv2Cli_GameMgr_InviteReceived: { case kSrv2Cli_GameMgr_InviteReceived: {
const Srv2Cli_GameMgr_InviteReceived & gmMsg = *(const Srv2Cli_GameMgr_InviteReceived *)gameMgrMsg->netMsg; const Srv2Cli_GameMgr_InviteReceived & gmMsg = *(const Srv2Cli_GameMgr_InviteReceived *)gameMgrMsg->netMsg;
const plString & inviterName = plNetClientMgr::GetInstance()->GetPlayerNameById(gmMsg.inviterId); const plString & inviterName = plNetClientMgr::GetInstance()->GetPlayerNameById(gmMsg.inviterId);
AddLineF("[GameMgr] Invite received: %S, %u. Inviter: %s", pfGameMgr::GetInstance()->GetGameNameByTypeId(gmMsg.gameTypeId), gmMsg.newGameId, inviterName.s_str("<Unknown>")); AddLineF("[GameMgr] Invite received: %S, %u. Inviter: %s", pfGameMgr::GetInstance()->GetGameNameByTypeId(gmMsg.gameTypeId), gmMsg.newGameId, inviterName.c_str("<Unknown>"));
} }
return true; return true;
@ -343,7 +343,7 @@ bool pfConsole::MsgReceive( plMessage *msg )
case kSrv2Cli_GameMgr_InviteRevoked: { case kSrv2Cli_GameMgr_InviteRevoked: {
const Srv2Cli_GameMgr_InviteRevoked & gmMsg = *(const Srv2Cli_GameMgr_InviteRevoked *)gameMgrMsg->netMsg; const Srv2Cli_GameMgr_InviteRevoked & gmMsg = *(const Srv2Cli_GameMgr_InviteRevoked *)gameMgrMsg->netMsg;
const plString & inviterName = plNetClientMgr::GetInstance()->GetPlayerNameById(gmMsg.inviterId); const plString & inviterName = plNetClientMgr::GetInstance()->GetPlayerNameById(gmMsg.inviterId);
AddLineF("[GameMgr] Invite revoked: %S, %u. Inviter: %s", pfGameMgr::GetInstance()->GetGameNameByTypeId(gmMsg.gameTypeId), gmMsg.newGameId, inviterName.s_str("<Unknown>")); AddLineF("[GameMgr] Invite revoked: %S, %u. Inviter: %s", pfGameMgr::GetInstance()->GetGameNameByTypeId(gmMsg.gameTypeId), gmMsg.newGameId, inviterName.c_str("<Unknown>"));
} }
return true; return true;

2
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp
Unescape View File

@ -115,7 +115,7 @@ PYTHON_GLOBAL_METHOD_DEFINITION(PtGetClientName, args, "Params: avatarKey=None\n
PYTHON_RETURN_ERROR; PYTHON_RETURN_ERROR;
} }
pyKey* key = pyKey::ConvertFrom(keyObj); pyKey* key = pyKey::ConvertFrom(keyObj);
return PyString_FromString(cyMisc::GetClientName(*key).s_str()); return PyString_FromString(cyMisc::GetClientName(*key).c_str());
} }
else else
return PyString_FromString(cyMisc::GetLocalClientName().c_str()); return PyString_FromString(cyMisc::GetLocalClientName().c_str());

4
Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h
Unescape View File

@ -379,7 +379,8 @@ public:
char *buffer = new char[count]; char *buffer = new char[count];
stream->ReadLE(count, buffer); stream->ReadLE(count, buffer);
buffer[count-1] = 0; buffer[count-1] = 0;
fString = plString::Steal(buffer, count); fString = plString::FromUtf8(buffer, count);
delete [] buffer;
} }
else else
fString = plString::Null; fString = plString::Null;
@ -433,7 +434,6 @@ public:
else else
count = 0; count = 0;
stream->WriteLE(count); stream->WriteLE(count);
if ( count != 0 )
stream->WriteLE(count, fString.c_str()); stream->WriteLE(count, fString.c_str());
break; break;

6
Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp
Unescape View File

@ -607,7 +607,7 @@ const plPythonSDLModifier* plPythonSDLModifier::FindAgeSDL()
return sdlMod; return sdlMod;
plNetClientApp::StaticErrorMsg("pfmod %s has a nil python SDL modifier for age sdl %s", plNetClientApp::StaticErrorMsg("pfmod %s has a nil python SDL modifier for age sdl %s",
pfmod->GetKeyName().s_str("?"), ageName); pfmod->GetKeyName().c_str("?"), ageName);
} }
else else
{ {
@ -616,11 +616,11 @@ const plPythonSDLModifier* plPythonSDLModifier::FindAgeSDL()
else else
if (!key->ObjectIsLoaded()) if (!key->ObjectIsLoaded())
plNetClientApp::StaticErrorMsg("key %s not loaded for age sdl %s", plNetClientApp::StaticErrorMsg("key %s not loaded for age sdl %s",
key->GetName().s_str("?"), ageName); key->GetName().c_str("?"), ageName);
else else
if (!plPythonFileMod::ConvertNoRef(key->ObjectIsLoaded())) if (!plPythonFileMod::ConvertNoRef(key->ObjectIsLoaded()))
plNetClientApp::StaticErrorMsg("key %s is not a python file mod for age sdl %s", plNetClientApp::StaticErrorMsg("key %s is not a python file mod for age sdl %s",
key->GetName().s_str("?"), ageName); key->GetName().c_str("?"), ageName);
} }
} }
else else

2
Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp
Unescape View File

@ -145,7 +145,7 @@ void hsKeyedObject::UnRegisterAsManual(plUoid& inUoid)
#if !HS_BUILD_FOR_UNIX // disable for unix servers #if !HS_BUILD_FOR_UNIX // disable for unix servers
hsAssert(false, hsAssert(false,
plString::Format("Request to Unregister wrong FixedKey, keyName=%s, inUoid=%s, myUoid=%s", plString::Format("Request to Unregister wrong FixedKey, keyName=%s, inUoid=%s, myUoid=%s",
fpKey->GetName().s_str("?"), inUoid.StringIze().c_str(), myUoid.StringIze().c_str()).c_str()); fpKey->GetName().c_str("?"), inUoid.StringIze().c_str(), myUoid.StringIze().c_str()).c_str());
#endif #endif
} }
((plKeyImp*)fpKey)->UnRegister(); ((plKeyImp*)fpKey)->UnRegister();

8
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
Unescape View File

@ -386,7 +386,7 @@ static void ILogSpan(plStatusLog* statusLog, plGeometrySpan* geo, plVertexSpan*
uint32_t ptr = cell->fVtxStart + span->fCellOffset * stride; uint32_t ptr = cell->fVtxStart + span->fCellOffset * stride;
statusLog->AddLineF("From obj <%s> mat <%s> size %d bytes grp=%d (%d offset)", statusLog->AddLineF("From obj <%s> mat <%s> size %d bytes grp=%d (%d offset)",
geo->fMaxOwner.s_str("<unknown>"), geo->fMaxOwner.c_str("<unknown>"),
geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>", geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>",
geo->GetVertexSize(geo->fFormat) * geo->fNumVerts + sizeof(uint16_t) * geo->fNumIndices, geo->GetVertexSize(geo->fFormat) * geo->fNumVerts + sizeof(uint16_t) * geo->fNumIndices,
span->fGroupIdx, span->fGroupIdx,
@ -404,7 +404,7 @@ static void ILogSpan(plStatusLog* statusLog, plGeometrySpan* geo, plVertexSpan*
else else
{ {
statusLog->AddLineF("Instanced obj <%s> mat <%s> grp=%d (%d/%d/%d/%d/%d/%d/%d/%d)", statusLog->AddLineF("Instanced obj <%s> mat <%s> grp=%d (%d/%d/%d/%d/%d/%d/%d/%d)",
geo->fMaxOwner.s_str("<unknown>"), geo->fMaxOwner.c_str("<unknown>"),
geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>", geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>",
span->fGroupIdx, span->fGroupIdx,
span->fVBufferIdx, span->fVBufferIdx,
@ -423,7 +423,7 @@ static void ILogSpan(plStatusLog* statusLog, plGeometrySpan* geo, plVertexSpan*
if( geo->fProps & plGeometrySpan::kFirstInstance ) if( geo->fProps & plGeometrySpan::kFirstInstance )
{ {
statusLog->AddLineF("From obj <%s> mat <%s> size %d bytes grp=%d (%d/%d/%d/%d/%d)", statusLog->AddLineF("From obj <%s> mat <%s> size %d bytes grp=%d (%d/%d/%d/%d/%d)",
geo->fMaxOwner.s_str("<unknown>"), geo->fMaxOwner.c_str("<unknown>"),
geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>", geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>",
geo->GetVertexSize(geo->fFormat) * geo->fNumVerts + sizeof(uint16_t) * geo->fNumIndices, geo->GetVertexSize(geo->fFormat) * geo->fNumVerts + sizeof(uint16_t) * geo->fNumIndices,
span->fGroupIdx, span->fGroupIdx,
@ -437,7 +437,7 @@ static void ILogSpan(plStatusLog* statusLog, plGeometrySpan* geo, plVertexSpan*
else else
{ {
statusLog->AddLineF("Instanced obj <%s> mat <%s> grp=%d (%d/%d/%d/%d/%d)", statusLog->AddLineF("Instanced obj <%s> mat <%s> grp=%d (%d/%d/%d/%d/%d)",
geo->fMaxOwner.s_str("<unknown>"), geo->fMaxOwner.c_str("<unknown>"),
geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>", geo->fMaterial ? geo->fMaterial->GetKey()->GetName().c_str() : "<unknown>",
span->fGroupIdx, span->fGroupIdx,
span->fVBufferIdx, span->fVBufferIdx,

2
Sources/Tools/MaxConvert/hsMaterialConverter.cpp
Unescape View File

@ -4951,7 +4951,7 @@ void hsMaterialConverter::IPrintDoneMat(hsStream* stream, const char* prefix, Do
stream->WriteString(buff); stream->WriteString(buff);
sprintf(buff, "\t\t\tTexture %s\n", layer->GetTexture() && layer->GetTexture()->GetKey() sprintf(buff, "\t\t\tTexture %s\n", layer->GetTexture() && layer->GetTexture()->GetKey()
? layer->GetTexture()->GetKey()->GetName().s_str("None") ? layer->GetTexture()->GetKey()->GetName().c_str("None")
: "None"); : "None");
stream->WriteString(buff); stream->WriteString(buff);

2
Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp
Unescape View File

@ -897,7 +897,7 @@ plString plAnimStealthNode::GetLoopName( void ) const { return
void plAnimStealthNode::SetLoop( bool b, const plString &name ) void plAnimStealthNode::SetLoop( bool b, const plString &name )
{ {
fParamBlock->SetValue( (ParamID)kPBLoop, 0, (int)b ); fParamBlock->SetValue( (ParamID)kPBLoop, 0, (int)b );
fParamBlock->SetValue( (ParamID)kPBLoopName, 0, (char *)name.s_str() ); fParamBlock->SetValue( (ParamID)kPBLoopName, 0, (char *)name.c_str() );
} }
uint8_t plAnimStealthNode::GetEaseInType( void ) const { return (uint8_t)fParamBlock->GetInt( (ParamID)kPBEaseInType ); } uint8_t plAnimStealthNode::GetEaseInType( void ) const { return (uint8_t)fParamBlock->GetInt( (ParamID)kPBEaseInType ); }

Write Preview
Loading…
Cancel
Save