thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rewrote config class; cleanup; code restructuring

Browse source 
svn-id: r4903
This commit is contained in:
Max Horn 2002-09-08 01:08:12 +00:00
parent 943de561bf
commit 523d8e64c0
36 changed files with 882 additions and 648 deletions
Download patch file Download diff file Expand all files Collapse all files

190
common/util.cpp
View file

@ -80,8 +80,6 @@ void ClearBlendCache(byte *palette, int weight)
}
#pragma mark -
/*
* Print hexdump of the data passed in, 8 bytes a row
*/
@ -122,191 +120,3 @@ void hexdump(const byte * data, int len)
printf(" ");
printf("|\n");
}
#pragma mark -
namespace ScummVM {
String::String(const char *str)
{
_refCount = new int(1);
_capacity = _len = strlen(str);
_str = (char *)calloc(1, _capacity+1);
memcpy(_str, str, _len+1);
}
String::String(const String &str)
{
++(*str._refCount);
_refCount = str._refCount;
_capacity = str._capacity;
_len = str._capacity;
_str = str._str;
}
String::~String()
{
decRefCount();
}
void String::decRefCount()
{
--(*_refCount);
if (*_refCount <= 0) {
delete _refCount;
if (_str)
free(_str);
}
}
String& String::operator =(const char* str)
{
int len = strlen(str);
if (len > 0) {
ensureCapacity(len, false);
_len = len;
memcpy(_str, str, _len + 1);
} else if (_len > 0) {
decRefCount();
_refCount = new int(1);
_capacity = 0;
_len = 0;
_str = 0;
}
return *this;
}
String& String::operator =(const String& str)
{
++(*str._refCount);
decRefCount();
_refCount = str._refCount;
_capacity = str._capacity;
_len = str._len;
_str = str._str;
return *this;
}
String& String::operator +=(const char* str)
{
int len = strlen(str);
if (len > 0) {
ensureCapacity(_len + len, true);
memcpy(_str + _len, str, len + 1);
_len += len;
}
return *this;
}
String& String::operator +=(const String& str)
{
int len = str._len;
if (len > 0) {
ensureCapacity(_len + len, true);
memcpy(_str + _len, str._str, len + 1);
_len += len;
}
return *this;
}
String& String::operator +=(char c)
{
ensureCapacity(_len + 1, true);
_str[_len++] = c;
_str[_len] = 0;
return *this;
}
bool String::operator ==(const String& x)
{
return (_len == x._len) && ((_len == 0) || (0 == strcmp(_str, x._str)));
}
bool String::operator ==(const char* x)
{
if (_str == 0)
return (x == 0) || (*x == 0);
if (x == 0)
return (_len == 0);
return (0 != strcmp(_str, x));
}
bool String::operator !=(const String& x)
{
return (_len != x._len) || ((_len != 0) && (0 != strcmp(_str, x._str)));
}
bool String::operator !=(const char* x)
{
if (_str == 0)
return (x != 0) && (*x != 0);
if (x == 0)
return (_len != 0);
return (0 == strcmp(_str, x));
}
void String::deleteLastChar() {
if (_len > 0) {
ensureCapacity(_len - 1, true);
_str[--_len] = 0;
}
}
void String::clear()
{
if (_capacity) {
decRefCount();
_refCount = new int(1);
_capacity = 0;
_len = 0;
_str = 0;
}
}
void String::ensureCapacity(int new_len, bool keep_old)
{
// If there is not enough space, or if we are not the only owner
// of the current data, then we have to reallocate it.
if (new_len <= _capacity && *_refCount == 1)
return;
int newCapacity = (new_len <= _capacity) ? _capacity : new_len + 32;
char *newStr = (char *)calloc(1, newCapacity+1);
if (keep_old && _str)
memcpy(newStr, _str, _len + 1);
else
_len = 0;
decRefCount();
_refCount = new int(1);
_capacity = newCapacity;
_str = newStr;
}
bool operator == (const char* y, const String& x)
{
return x == y;
}
bool operator != (const char* y, const String& x)
{
return x != y;
}
}; // End of namespace ScummVM