GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[libromdata] WiiUPackagePrivate::addFields_System_XMLs(): Use C strings instead of C++ strings for the XML keys.
Some checks are pending
Codecov / run (push) Waiting to run
Details
CodeQL / Analyze (cpp) (push) Waiting to run
Details

Browse Source 
Reduces memory usage slightly and probably improves performance a bit,
since we don't have to manage buffer sizes.

Code size differences: (64-bit Gentoo Linux, gcc-15.1.0, release build, no LTO)

   text    data     bss     dec     hex filename
  15953     288       0   16241    3f71 WiiUPackage_xml.cpp.o [before]
  13376     288       0   13664    3560 WiiUPackage_xml.cpp.o [after]
  -2577       0       0   -2577    -a11 Difference
This commit is contained in:
David Korth 2025-06-07 15:25:51 -04:00
parent 5fd65dc7e2
commit 1aad707f88
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libromdata/Console/WiiUPackage_xml.cpp
View File

@ -305,24 +305,18 @@ int WiiUPackagePrivate::addFields_System_XMLs(void)
array<const char*, WiiU_LC_COUNT> longnames;
array<const char*, WiiU_LC_COUNT> shortnames;
array<const char*, WiiU_LC_COUNT> publishers;
string longname_key = "longname_";
string shortname_key = "shortname_";
string publisher_key = "publisher_";
longname_key.reserve(13);
shortname_key.reserve(14);
publisher_key.reserve(14);
char longname_key[16] = "longname_";
char shortname_key[16] = "shortname_";
char publisher_key[16] = "publisher_";
for (size_t i = 0; i < xml_lc_map.size(); i++) {
longname_key.resize(9);
shortname_key.resize(10);
publisher_key.resize(10);
// NOTE: xml_lc_map[i].xml_lc cannot be more than 3 letters.
strcpy(&longname_key[9], xml_lc_map[i].xml_lc);
strcpy(&shortname_key[10], xml_lc_map[i].xml_lc);
strcpy(&publisher_key[10], xml_lc_map[i].xml_lc);
longname_key += xml_lc_map[i].xml_lc;
shortname_key += xml_lc_map[i].xml_lc;
publisher_key += xml_lc_map[i].xml_lc;
longnames[i] = metaRootNode.child(longname_key.c_str()).text().as_string(nullptr);
shortnames[i] = metaRootNode.child(shortname_key.c_str()).text().as_string(nullptr);
publishers[i] = metaRootNode.child(publisher_key.c_str()).text().as_string(nullptr);
longnames[i] = metaRootNode.child(longname_key).text().as_string(nullptr);
shortnames[i] = metaRootNode.child(shortname_key).text().as_string(nullptr);
publishers[i] = metaRootNode.child(publisher_key).text().as_string(nullptr);
}
// If English is valid, we'll deduplicate titles.
@ -334,9 +328,9 @@ int WiiUPackagePrivate::addFields_System_XMLs(void)
RomFields::StringMultiMap_t *const pMap_publisher = new RomFields::StringMultiMap_t();
for (int langID = 0; langID < static_cast<int>(xml_lc_map.size()); langID++) {
// Check for empty strings first.
if ((!longnames[langID] || longnames[langID][0] == '\0') &&
(!shortnames[langID] || shortnames[langID][0] == '\0') &&
(!publishers[langID] || publishers[langID][0] == '\0'))
if (( !longnames[langID] || longnames[langID][0] == '\0') &&
(!shortnames[langID] || shortnames[langID][0] == '\0') &&
(!publishers[langID] || publishers[langID][0] == '\0'))
{
// Strings are empty.
continue;
@ -344,9 +338,9 @@ int WiiUPackagePrivate::addFields_System_XMLs(void)
if (dedupe_titles && langID != 1 /* English */) {
// Check if the title matches English.
if (longnames[langID] && longnames[1] && !strcmp(longnames[langID], longnames[1]) &&
shortnames[langID] && shortnames[1] && !strcmp(shortnames[langID], shortnames[1]) &&
publishers[langID] && publishers[1] && !strcmp(publishers[langID], publishers[1]))
if ( longnames[langID] && longnames[1] && !strcmp( longnames[langID], longnames[1]) &&
shortnames[langID] && shortnames[1] && !strcmp(shortnames[langID], shortnames[1]) &&
publishers[langID] && publishers[1] && !strcmp(publishers[langID], publishers[1]))
{
// All three title fields match English.
continue;