Branimir Karadžić 7 年 前
コミット
a58b42f31b
3 ファイル変更6 行追加6 行削除
  1. 1 1
      include/bx/settings.h
  2. 2 2
      src/settings.cpp
  3. 3 3
      tests/settings_test.cpp

+ 1 - 1
include/bx/settings.h

@@ -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 = "");

+ 2 - 2
src/settings.cpp

@@ -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);

+ 3 - 3
tests/settings_test.cpp

@@ -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") );
 }