mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-06 17:15:00 -06:00
21.07
This commit is contained in:
@@ -1096,14 +1096,14 @@ UString::UString(char c)
|
||||
|
||||
UString::UString(const wchar_t *s)
|
||||
{
|
||||
unsigned len = MyStringLen(s);
|
||||
const unsigned len = MyStringLen(s);
|
||||
SetStartLen(len);
|
||||
wmemcpy(_chars, s, len + 1);
|
||||
}
|
||||
|
||||
UString::UString(const char *s)
|
||||
{
|
||||
unsigned len = MyStringLen(s);
|
||||
const unsigned len = MyStringLen(s);
|
||||
SetStartLen(len);
|
||||
wchar_t *chars = _chars;
|
||||
for (unsigned i = 0; i < len; i++)
|
||||
@@ -1111,6 +1111,17 @@ UString::UString(const char *s)
|
||||
chars[len] = 0;
|
||||
}
|
||||
|
||||
UString::UString(const AString &s)
|
||||
{
|
||||
const unsigned len = s.Len();
|
||||
SetStartLen(len);
|
||||
wchar_t *chars = _chars;
|
||||
const char *s2 = s.Ptr();
|
||||
for (unsigned i = 0; i < len; i++)
|
||||
chars[i] = (unsigned char)s2[i];
|
||||
chars[len] = 0;
|
||||
}
|
||||
|
||||
UString::UString(const UString &s)
|
||||
{
|
||||
SetStartLen(s._len);
|
||||
|
||||
Reference in New Issue
Block a user