This commit is contained in:
Branimir Karadžić
2018-11-03 10:46:09 -07:00
parent 9fc2f996f7
commit a58b42f31b
3 changed files with 6 additions and 6 deletions

View File

@@ -29,7 +29,7 @@ namespace bx
void load(const void* _data, uint32_t _len);
///
const char* get(const StringView& _name) const;
StringView get(const StringView& _name) const;
///
void set(const StringView& _name, const StringView& _value = "");

View File

@@ -63,7 +63,7 @@ void Settings::load(const void* _data, uint32_t _len)
}
}
const char* Settings::get(const StringView& _name) const
StringView Settings::get(const StringView& _name) const
{
ini_t* ini = INI_T(m_ini);
@@ -84,7 +84,7 @@ const char* Settings::get(const StringView& _name) const
int32_t property = ini_find_property(ini, section, fileName.getPtr(), fileName.getLength() );
if (INI_NOT_FOUND == property)
{
return NULL;
return StringView();
}
return ini_property_value(ini, section, property);

View File

@@ -27,12 +27,12 @@ TEST_CASE("Settings", "")
bx::close(&writer);
}
REQUIRE(NULL == settings.get("meh") );
REQUIRE(settings.get("meh").isEmpty() );
REQUIRE(0 == bx::strCmp(settings.get("meh/podmac"), "true") );
REQUIRE(0 == bx::strCmp(settings.get("test/foo/bar/abvgd"), "1389") );
settings.remove("meh/podmac");
REQUIRE(NULL == settings.get("meh/podmac") );
REQUIRE(settings.get("meh/podmac").isEmpty() );
settings.clear();
@@ -43,7 +43,7 @@ TEST_CASE("Settings", "")
bx::close(&reader);
}
REQUIRE(NULL == settings.get("meh") );
REQUIRE(settings.get("meh").isEmpty() );
REQUIRE(0 == bx::strCmp(settings.get("meh/podmac"), "true") );
REQUIRE(0 == bx::strCmp(settings.get("test/foo/bar/abvgd"), "1389") );
}