Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bx/settings.h
View File

@@ -29,7 +29,7 @@ namespace bx
void load(const void* _data, uint32_t _len); 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 = ""); void set(const StringView& _name, const StringView& _value = "");

4
src/settings.cpp
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); 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() ); int32_t property = ini_find_property(ini, section, fileName.getPtr(), fileName.getLength() );
if (INI_NOT_FOUND == property) if (INI_NOT_FOUND == property)
{ {
return NULL; return StringView();
} }
return ini_property_value(ini, section, property); return ini_property_value(ini, section, property);

6
tests/settings_test.cpp
View File

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