ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-11 21:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldso: avoid use of Xml_node assign operator

Browse Source 
Issue #5411
This commit is contained in:
Norman Feske 2025-01-07 10:57:32 +01:00 committed by Christian Helmuth
parent cadf774fa0
commit bdb8d4d881
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
repos/base/src/lib/ldso/include/config.h
View File

@ -24,35 +24,17 @@ class Linker::Config : Noncopyable
{ {
private: private:
/* Attached_rom_dataspace const _config;
* Helper to transparently handle the case where no "config" ROM is
* available.
*/
struct Xml_config : Xml_node
{
Constructible<Attached_rom_dataspace> _rom { };
Xml_config(Env &env) : Xml_node("<empty/>") Bind const _bind = _config.xml().attribute_value("ld_bind_now", false)
{
try {
_rom.construct(env, "config");
static_cast<Xml_node &>(*this) = _rom->xml();
}
catch (...) { }
}
};
Xml_config const _config;
Bind const _bind = _config.attribute_value("ld_bind_now", false)
? BIND_NOW : BIND_LAZY; ? BIND_NOW : BIND_LAZY;
bool const _verbose = _config.attribute_value("ld_verbose", false); bool const _verbose = _config.xml().attribute_value("ld_verbose", false);
bool const _check_ctors = _config.attribute_value("ld_check_ctors", true); bool const _check_ctors = _config.xml().attribute_value("ld_check_ctors", true);
public: public:
Config(Env &env) : _config(env) { } Config(Env &env) : _config(env, "config") { }
Bind bind() const { return _bind; } Bind bind() const { return _bind; }
bool verbose() const { return _verbose; } bool verbose() const { return _verbose; }
@ -67,7 +49,7 @@ class Linker::Config : Noncopyable
*/ */
void for_each_library(auto const &fn) const void for_each_library(auto const &fn) const
{ {
_config.with_optional_sub_node("ld", [&] (Xml_node ld) { _config.xml().with_optional_sub_node("ld", [&] (Xml_node ld) {
ld.for_each_sub_node("library", [&] (Xml_node lib) { ld.for_each_sub_node("library", [&] (Xml_node lib) {