1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

give the XML tag map and the writer buffer a name

Browse Source 
Both of these bound a non-const reference to a temporary, which MSVC accepts
and clang does not, and which leaves the reference dangling once the full
expression ends.

PropertyContainer::initFromXMLFile and writeToXMLFile take their tag map by
non-const reference because the accessors on it insert default tag names as
they are asked for, so it cannot be const and it cannot be a temporary. All
eight call sites passed a freshly built one; they now declare it. Each keeps
its own object, so a map filled in by one call cannot leak into the next, the
same as when each call built its own temporary.

XMLWriter::writeToFile bound std::string& to what stringstream::str() returns
by value. Declared as a value it is initialised straight from the return with
no copy, and const because only c_str() and length() are asked of it.

Verification:

    grep -rn 'PropertyContainer::TagMap()' .   # nothing
    ninja -C build parse         # no i18n or XMLWriter sites remain
    ninja -C build -k 0          # Release, four applications, green
    ninja -C build-debug -k 0    # Debug, four applications, green

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Marco Antonio J. Costa
2026-07-23 19:29:55 -03:00
committed by majcosta
co-authored by Claude Opus 4.8
parent b5ea70aa44
commit e56a372871
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
i18n/ExportStrings.cpp
+12 -6
View File
@@ -524,7 +524,8 @@ void ExportMercBio()
Translate(pAddInfo, SIZE_MERC_ADDITIONAL_INFO, g_lang);
props.setStringProperty(L"Add", vfs::toString<wchar_t>(i), pAddInfo);
}
props.writeToXMLFile(L"Localization/AimBiographies.xml", vfs::PropertyContainer::TagMap());
vfs::PropertyContainer::TagMap tags;
props.writeToXMLFile(L"Localization/AimBiographies.xml", tags);
}
void ExportAIMHistory()
@@ -544,7 +545,8 @@ void ExportAIMHistory()
Translate(pHistLine, AIM_HISTORY_LINE_SIZE, g_lang);
props.setStringProperty(L"Line", vfs::toString<wchar_t>(i), pHistLine);
}
props.writeToXMLFile(L"Localization/AimHistory.xml", vfs::PropertyContainer::TagMap());
vfs::PropertyContainer::TagMap tags;
props.writeToXMLFile(L"Localization/AimHistory.xml", tags);
}
@@ -565,7 +567,8 @@ void ExportAIMPolicy()
Translate(pPolLine, AIM_HISTORY_LINE_SIZE, g_lang);
props.setStringProperty(L"Line", vfs::toString<wchar_t>(i), pPolLine);
}
props.writeToXMLFile(L"Localization/AimPolicy.xml", vfs::PropertyContainer::TagMap());
vfs::PropertyContainer::TagMap tags;
props.writeToXMLFile(L"Localization/AimPolicy.xml", tags);
}
void ExportAlumniName()
@@ -585,7 +588,8 @@ void ExportAlumniName()
Translate(pAlumniName, AIM_ALUMNI_NAME_SIZE, g_lang);
props.setStringProperty(L"Line", vfs::toString<wchar_t>(i), pAlumniName);
}
props.writeToXMLFile(L"Localization/AlumniName.xml", vfs::PropertyContainer::TagMap());
vfs::PropertyContainer::TagMap tags;
props.writeToXMLFile(L"Localization/AlumniName.xml", tags);
}
void ExportDialogues()
@@ -621,7 +625,8 @@ void ExportDialogues()
}
vfs::Path x(L"Localization/Dialogue");
x += vfs::Path(file.getName().c_wcs() + L".xml");
props.writeToXMLFile(x, vfs::PropertyContainer::TagMap());
vfs::PropertyContainer::TagMap tags;
props.writeToXMLFile(x, tags);
}
}
@@ -668,7 +673,8 @@ void ExportNPCDialogues()
}
vfs::Path x(L"Localization/NpcDialogue");
x += vfs::Path(file.getName().c_wcs() + L".xml");
props.writeToXMLFile(x, vfs::PropertyContainer::TagMap());
vfs::PropertyContainer::TagMap tags;
props.writeToXMLFile(x, tags);
}
}
} // namespace