summaryrefslogtreecommitdiff
path: root/core/string_db.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-03-09 00:14:08 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-03-09 00:14:08 +0100
commite46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch)
treecf91f2869ff8f058c6682569fb31e22e5ee736ad /core/string_db.cpp
parent1dad6eca812e5c2e313b54265114de8a1d73d999 (diff)
parent4a4f2479146aa33e235ed57cde311efda68d3c8f (diff)
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to 'core/string_db.cpp')
-rw-r--r--core/string_db.cpp104
1 files changed, 52 insertions, 52 deletions
diff --git a/core/string_db.cpp b/core/string_db.cpp
index 0e953cc326..9a693f88e9 100644
--- a/core/string_db.cpp
+++ b/core/string_db.cpp
@@ -43,23 +43,23 @@ StringName _scs_create(const char *p_chr) {
bool StringName::configured=false;
void StringName::setup() {
-
+
ERR_FAIL_COND(configured);
for(int i=0;i<STRING_TABLE_LEN;i++) {
-
+
_table[i]=NULL;
}
configured=true;
}
void StringName::cleanup() {
-
- _global_lock();
+
+ _global_lock();
int lost_strings=0;
for(int i=0;i<STRING_TABLE_LEN;i++) {
-
+
while(_table[i]) {
-
+
_Data*d=_table[i];
lost_strings++;
if (OS::get_singleton()->is_stdout_verbose()) {
@@ -71,23 +71,23 @@ void StringName::cleanup() {
}
}
- _table[i]=_table[i]->next;
+ _table[i]=_table[i]->next;
memdelete(d);
}
}
if (OS::get_singleton()->is_stdout_verbose() && lost_strings) {
print_line("StringName: "+itos(lost_strings)+" unclaimed string names at exit.");
}
- _global_unlock();
+ _global_unlock();
}
void StringName::unref() {
-
+
ERR_FAIL_COND(!configured);
if (_data && _data->refcount.unref()) {
-
- _global_lock();
+
+ _global_lock();
if (_data->prev) {
_data->prev->next=_data->next;
@@ -97,26 +97,26 @@ void StringName::unref() {
}
_table[_data->idx]=_data->next;
}
-
+
if (_data->next) {
_data->next->prev=_data->prev;
}
memdelete(_data);
- _global_unlock();
+ _global_unlock();
}
-
+
_data=NULL;
-
+
}
bool StringName::operator==(const String& p_name) const {
-
+
if (!_data) {
-
+
return (p_name.length()==0);
}
-
+
return (_data->get_name()==p_name);
}
@@ -131,50 +131,50 @@ bool StringName::operator==(const char* p_name) const {
}
bool StringName::operator!=(const String& p_name) const {
-
+
return !(operator==(p_name));
}
bool StringName::operator!=(const StringName& p_name) const {
-
- // the real magic of all this mess happens here.
+
+ // the real magic of all this mess happens here.
// this is why path comparisons are very fast
return _data!=p_name._data;
-
+
}
void StringName::operator=(const StringName& p_name) {
-
+
if (this==&p_name)
return;
-
+
unref();
-
+
if (p_name._data && p_name._data->refcount.ref()) {
-
- _data = p_name._data;
+
+ _data = p_name._data;
}
}
/* was inlined
StringName::operator String() const {
-
+
if (_data)
return _data->get_name();
-
+
return "";
}
*/
StringName::StringName(const StringName& p_name) {
-
+
ERR_FAIL_COND(!configured);
_data=NULL;
if (p_name._data && p_name._data->refcount.ref()) {
-
- _data = p_name._data;
- }
+
+ _data = p_name._data;
+ }
}
StringName::StringName(const char *p_name) {
@@ -184,17 +184,17 @@ StringName::StringName(const char *p_name) {
ERR_FAIL_COND(!configured);
ERR_FAIL_COND( !p_name || !p_name[0]);
-
- _global_lock();
-
+
+ _global_lock();
+
uint32_t hash = String::hash(p_name);
-
+
uint32_t idx=hash&STRING_TABLE_MASK;
-
+
_data=_table[idx];
-
+
while(_data) {
-
+
// compare hash first
if (_data->hash==hash && _data->get_name()==p_name)
break;
@@ -226,7 +226,7 @@ StringName::StringName(const char *p_name) {
_global_unlock();
-
+
}
StringName::StringName(const StaticCString& p_static_string) {
@@ -268,7 +268,7 @@ StringName::StringName(const StaticCString& p_static_string) {
_data->refcount.init();
_data->hash=hash;
- _data->idx=idx;
+ _data->idx=idx;
_data->cname=p_static_string.ptr;
_data->next=_table[idx];
_data->prev=NULL;
@@ -283,26 +283,26 @@ StringName::StringName(const StaticCString& p_static_string) {
StringName::StringName(const String& p_name) {
-
+
_data=NULL;
ERR_FAIL_COND(!configured);
- _global_lock();
-
+ _global_lock();
+
uint32_t hash = p_name.hash();
-
+
uint32_t idx=hash&STRING_TABLE_MASK;
_data=_table[idx];
-
+
while(_data) {
-
+
if (_data->hash==hash && _data->get_name()==p_name)
break;
_data=_data->next;
}
-
+
if (_data) {
if (_data->refcount.ref()) {
@@ -329,7 +329,7 @@ StringName::StringName(const String& p_name) {
_table[idx]=_data;
_global_unlock();
-
+
}
StringName StringName::search(const char *p_name) {
@@ -435,12 +435,12 @@ StringName StringName::search(const String &p_name) {
StringName::StringName() {
-
+
_data=NULL;
}
StringName::~StringName() {
-
+
unref();
}