[libromdata] Xbox360_XDBF_Private::loadString_GPD(): Reduce the scope of s_ret.

GerbilSoft · GerbilSoft · commit 7e016e18260a · 2025-11-25T23:49:36.000-05:00
Return {} instead of an empty s_ret (previously ret).
diff --git a/src/libromdata/Console/Xbox360_XDBF.cpp b/src/libromdata/Console/Xbox360_XDBF.cpp
@@ -534,17 +534,15 @@ string Xbox360_XDBF_Private::loadString_SPA(XDBF_Language_e langID, uint16_t str
  */
 string Xbox360_XDBF_Private::loadString_GPD(uint16_t string_id)
 {
-	string ret;
-
 	if (entryTable.empty()) {
 		// Entry table isn't loaded...
-		return ret;
+		return {};
 	}
 
 	// Can we load the string?
 	if (!file || !isValid) {
 		// Can't load the string.
-		return ret;
+		return {};
 	}
 
 #if SYS_BYTEORDER == SYS_LIL_ENDIAN
@@ -559,6 +557,7 @@ string Xbox360_XDBF_Private::loadString_GPD(uint16_t string_id)
 
 	// GPD doesn't have string tables.
 	// Instead, each string is its own entry in the main resource table.
+	string s_ret;
 	for (const XDBF_Entry &p : entryTable) {
 		if (p.namespace_id != cpu_to_be16(XDBF_GPD_NAMESPACE_STRING)) {
 			// Not a string.
@@ -595,11 +594,11 @@ string Xbox360_XDBF_Private::loadString_GPD(uint16_t string_id)
 		}
 
 		// Convert from UTF-16BE and DOS line endings.
-		ret = dos2unix(utf16be_to_utf8(sbuf.get(), length / 2));
+		s_ret = dos2unix(utf16be_to_utf8(sbuf.get(), length / 2));
 		break;
 	}
 
-	return ret;
+	return s_ret;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -534,17 +534,15 @@ string Xbox360_XDBF_Private::loadString_SPA(XDBF_Language_e langID, uint16_t str`
`534`	`534`	`*/`
`535`	`535`	`string Xbox360_XDBF_Private::loadString_GPD(uint16_t string_id)`
`536`	`536`	`{`
`537`		`- string ret;`
`538`		`-`
`539`	`537`	`if (entryTable.empty()) {`
`540`	`538`	`// Entry table isn't loaded...`
`541`		`- return ret;`
	`539`	`+ return {};`
`542`	`540`	`}`
`543`	`541`
`544`	`542`	`// Can we load the string?`
`545`	`543`	`if (!file \|\| !isValid) {`
`546`	`544`	`// Can't load the string.`
`547`		`- return ret;`
	`545`	`+ return {};`
`548`	`546`	`}`
`549`	`547`
`550`	`548`	`#if SYS_BYTEORDER == SYS_LIL_ENDIAN`
`@@ -559,6 +557,7 @@ string Xbox360_XDBF_Private::loadString_GPD(uint16_t string_id)`
`559`	`557`
`560`	`558`	`// GPD doesn't have string tables.`
`561`	`559`	`// Instead, each string is its own entry in the main resource table.`
	`560`	`+ string s_ret;`
`562`	`561`	`for (const XDBF_Entry &p : entryTable) {`
`563`	`562`	`if (p.namespace_id != cpu_to_be16(XDBF_GPD_NAMESPACE_STRING)) {`
`564`	`563`	`// Not a string.`
`@@ -595,11 +594,11 @@ string Xbox360_XDBF_Private::loadString_GPD(uint16_t string_id)`
`595`	`594`	`}`
`596`	`595`
`597`	`596`	`// Convert from UTF-16BE and DOS line endings.`
`598`		`- ret = dos2unix(utf16be_to_utf8(sbuf.get(), length / 2));`
	`597`	`+ s_ret = dos2unix(utf16be_to_utf8(sbuf.get(), length / 2));`
`599`	`598`	`break;`
`600`	`599`	`}`
`601`	`600`
`602`		`- return ret;`
	`601`	`+ return s_ret;`
`603`	`602`	`}`
`604`	`603`
`605`	`604`	`/**`