summaryrefslogtreecommitdiffstats
path: root/core/string_db.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-04-18 22:20:39 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-04-18 22:20:39 +0200
commit9a759750421bc72ed41c1dc67c0fa9b5564b8abc (patch)
tree6916ad6fb910ba682dedfe91d9fe9b736659598c /core/string_db.cpp
parent9ce8d8ddda35cda781364e9b648325a2953d3f63 (diff)
downloadredot-engine-9a759750421bc72ed41c1dc67c0fa9b5564b8abc.tar.gz
Fix some Coverity warnings in String API
- StringName::StringName(const StringName &p_name) Non-static class member _data is not initialized in this constructor nor in any functions that it calls. - StringName::_Data() Non-static class member idx is not initialized in this constructor nor in any functions that it calls. - String::num_uint64(...) This less-than-zero comparison of an unsigned value is never true. n % base < 0UL. - String::hex_to_int(...) and String::hex_to_int64(...) Execution cannot reach this statement (deadcode)
Diffstat (limited to 'core/string_db.cpp')
-rw-r--r--core/string_db.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/core/string_db.cpp b/core/string_db.cpp
index 6e1f887754..2475cbe3e8 100644
--- a/core/string_db.cpp
+++ b/core/string_db.cpp
@@ -164,21 +164,14 @@ void StringName::operator=(const StringName &p_name) {
_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()) {
+ ERR_FAIL_COND(!configured);
+
+ if (p_name._data && p_name._data->refcount.ref()) {
_data = p_name._data;
}
}