mirror of
https://github.com/isledecomp/isle-portable.git
synced 2024-11-29 19:05:34 -05:00
2d9af630ba
Followed the hint from @madebr in #31 that the next function in MxString was operator+. The one after that is operator+= and both are at 100%. Squashed commits: * Removed unnecessary consts * Replaced malloc/free with new/delete, which solved swapped regs in operator= * Use delete[] when freeing char* m_data
114 lines
2.4 KiB
C++
114 lines
2.4 KiB
C++
#include "mxstring.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
// OFFSET: LEGO1 0x100ae200
|
|
MxString::MxString()
|
|
{
|
|
// Set string to one char in length and set that char to null terminator
|
|
this->m_data = new char[1];
|
|
this->m_data[0] = 0;
|
|
this->m_length = 0;
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae2a0
|
|
MxString::MxString(const MxString &str)
|
|
{
|
|
this->m_length = str.m_length;
|
|
this->m_data = new char[this->m_length + 1];
|
|
strcpy(this->m_data, str.m_data);
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae350
|
|
MxString::MxString(const char *str)
|
|
{
|
|
if (str) {
|
|
this->m_length = strlen(str);
|
|
this->m_data = new char[this->m_length + 1];
|
|
strcpy(this->m_data, str);
|
|
} else {
|
|
this->m_data = new char[1];
|
|
this->m_data[0] = 0;
|
|
this->m_length = 0;
|
|
}
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae420
|
|
MxString::~MxString()
|
|
{
|
|
delete[] this->m_data;
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae490
|
|
void MxString::ToUpperCase()
|
|
{
|
|
strupr(this->m_data);
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae4a0
|
|
void MxString::ToLowerCase()
|
|
{
|
|
strlwr(this->m_data);
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae4b0
|
|
MxString &MxString::operator=(MxString *param)
|
|
{
|
|
if (this->m_data != param->m_data)
|
|
{
|
|
delete[] this->m_data;
|
|
this->m_length = param->m_length;
|
|
this->m_data = new char[this->m_length + 1];
|
|
strcpy(this->m_data, param->m_data);
|
|
}
|
|
|
|
return *this;
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae510
|
|
const MxString &MxString::operator=(const char *param)
|
|
{
|
|
if (this->m_data != param)
|
|
{
|
|
delete[] this->m_data;
|
|
this->m_length = strlen(param);
|
|
this->m_data = new char[this->m_length + 1];
|
|
strcpy(this->m_data, param);
|
|
}
|
|
|
|
return *this;
|
|
}
|
|
|
|
// Return type is intentionally just MxString, not MxString&.
|
|
// This forces MSVC to add $ReturnUdt$ to the stack for 100% match.
|
|
// OFFSET: LEGO1 0x100ae580
|
|
MxString MxString::operator+(const char *str)
|
|
{
|
|
// MxString constructor allocates 1 byte for m_data, so free that first
|
|
MxString tmp;
|
|
delete[] tmp.m_data;
|
|
|
|
tmp.m_length = strlen(str) + this->m_length;
|
|
tmp.m_data = new char[tmp.m_length + 1];
|
|
|
|
strcpy(tmp.m_data, this->m_data);
|
|
strcpy(tmp.m_data + this->m_length, str);
|
|
|
|
return MxString(tmp);
|
|
}
|
|
|
|
// OFFSET: LEGO1 0x100ae690
|
|
MxString& MxString::operator+=(const char *str)
|
|
{
|
|
int newlen = this->m_length + strlen(str);
|
|
|
|
char *tmp = new char[newlen + 1];
|
|
strcpy(tmp, this->m_data);
|
|
strcpy(tmp + this->m_length, str);
|
|
|
|
delete[] this->m_data;
|
|
this->m_length = newlen;
|
|
this->m_data = tmp;
|
|
|
|
return *this;
|
|
}
|