From ba1eea9898b7c4bb4b0daac9da4a027df174c033 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 20 Feb 2021 22:27:20 +0100 Subject: [PATCH] LibELF+DynamicLoader: Rename DynamicObject::construct() => create() --- Userland/DynamicLoader/main.cpp | 2 +- Userland/Libraries/LibELF/DynamicLoader.cpp | 4 ++-- Userland/Libraries/LibELF/DynamicObject.cpp | 2 +- Userland/Libraries/LibELF/DynamicObject.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Userland/DynamicLoader/main.cpp b/Userland/DynamicLoader/main.cpp index 7b434cef26..d1c7a2d029 100644 --- a/Userland/DynamicLoader/main.cpp +++ b/Userland/DynamicLoader/main.cpp @@ -67,7 +67,7 @@ static void perform_self_relocations(auxv_t* auxvp) if (!dynamic_section_addr) exit(1); - auto dynamic_object = ELF::DynamicObject::construct((VirtualAddress(base_address)), (VirtualAddress(dynamic_section_addr))); + auto dynamic_object = ELF::DynamicObject::create((VirtualAddress(base_address)), (VirtualAddress(dynamic_section_addr))); dynamic_object->relocation_section().for_each_relocation([base_address](auto& reloc) { if (reloc.type() != R_386_RELATIVE) diff --git a/Userland/Libraries/LibELF/DynamicLoader.cpp b/Userland/Libraries/LibELF/DynamicLoader.cpp index 6c0e1bf504..7bf1f110d8 100644 --- a/Userland/Libraries/LibELF/DynamicLoader.cpp +++ b/Userland/Libraries/LibELF/DynamicLoader.cpp @@ -110,7 +110,7 @@ const DynamicObject& DynamicLoader::dynamic_object() const }); ASSERT(!dynamic_section_address.is_null()); - m_cached_dynamic_object = ELF::DynamicObject::construct(VirtualAddress(m_elf_image.base_address()), dynamic_section_address); + m_cached_dynamic_object = ELF::DynamicObject::create(VirtualAddress(m_elf_image.base_address()), dynamic_section_address); } return *m_cached_dynamic_object; } @@ -161,7 +161,7 @@ RefPtr DynamicLoader::map() load_program_headers(); - m_dynamic_object = DynamicObject::construct(m_text_segment_load_address, m_dynamic_section_address); + m_dynamic_object = DynamicObject::create(m_text_segment_load_address, m_dynamic_section_address); m_dynamic_object->set_tls_offset(m_tls_offset); m_dynamic_object->set_tls_size(m_tls_size); diff --git a/Userland/Libraries/LibELF/DynamicObject.cpp b/Userland/Libraries/LibELF/DynamicObject.cpp index 17fc1fa450..9825a1db7b 100644 --- a/Userland/Libraries/LibELF/DynamicObject.cpp +++ b/Userland/Libraries/LibELF/DynamicObject.cpp @@ -470,7 +470,7 @@ Optional DynamicObject::lookup_symbol(const S return SymbolLookupResult { res.value(), (FlatPtr)res.address().as_ptr(), res.bind(), this }; } -NonnullRefPtr DynamicObject::construct(VirtualAddress base_address, VirtualAddress dynamic_section_address) +NonnullRefPtr DynamicObject::create(VirtualAddress base_address, VirtualAddress dynamic_section_address) { return adopt(*new DynamicObject(base_address, dynamic_section_address)); } diff --git a/Userland/Libraries/LibELF/DynamicObject.h b/Userland/Libraries/LibELF/DynamicObject.h index a72b35ccb4..f2042e8331 100644 --- a/Userland/Libraries/LibELF/DynamicObject.h +++ b/Userland/Libraries/LibELF/DynamicObject.h @@ -36,7 +36,7 @@ namespace ELF { class DynamicObject : public RefCounted { public: - static NonnullRefPtr construct(VirtualAddress base_address, VirtualAddress dynamic_section_address); + static NonnullRefPtr create(VirtualAddress base_address, VirtualAddress dynamic_section_address); ~DynamicObject(); void dump() const;