diff options
Diffstat (limited to 'Userland/Libraries/LibELF/DynamicLinker.cpp')
| -rw-r--r-- | Userland/Libraries/LibELF/DynamicLinker.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Userland/Libraries/LibELF/DynamicLinker.cpp b/Userland/Libraries/LibELF/DynamicLinker.cpp index 66ce35adf3..b4d5033997 100644 --- a/Userland/Libraries/LibELF/DynamicLinker.cpp +++ b/Userland/Libraries/LibELF/DynamicLinker.cpp @@ -56,8 +56,8 @@ static bool s_do_breakpoint_trap_before_entry { false }; static StringView s_ld_library_path; static Result<void, DlErrorMessage> __dlclose(void* handle); -static Result<void*, DlErrorMessage> __dlopen(const char* filename, int flags); -static Result<void*, DlErrorMessage> __dlsym(void* handle, const char* symbol_name); +static Result<void*, DlErrorMessage> __dlopen(char const* filename, int flags); +static Result<void*, DlErrorMessage> __dlsym(void* handle, char const* symbol_name); static Result<void, DlErrorMessage> __dladdr(void* addr, Dl_info* info); Optional<DynamicObject::SymbolLookupResult> DynamicLinker::lookup_global_symbol(StringView name) @@ -84,7 +84,7 @@ static String get_library_name(String path) return LexicalPath::basename(move(path)); } -static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(const String& filename, int fd) +static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(String const& filename, int fd) { auto result = ELF::DynamicLoader::try_create(fd, filename); if (result.is_error()) { @@ -139,7 +139,7 @@ static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(String c return DlErrorMessage { String::formatted("Could not find required shared library: {}", name) }; } -static Vector<String> get_dependencies(const String& name) +static Vector<String> get_dependencies(String const& name) { auto lib = s_loaders.get(name).value(); Vector<String> dependencies; @@ -152,13 +152,13 @@ static Vector<String> get_dependencies(const String& name) return dependencies; } -static Result<void, DlErrorMessage> map_dependencies(const String& name) +static Result<void, DlErrorMessage> map_dependencies(String const& name) { dbgln_if(DYNAMIC_LOAD_DEBUG, "mapping dependencies for: {}", name); auto const& parent_object = (*s_loaders.get(name))->dynamic_object(); - for (const auto& needed_name : get_dependencies(name)) { + for (auto const& needed_name : get_dependencies(name)) { dbgln_if(DYNAMIC_LOAD_DEBUG, "needed library: {}", needed_name.characters()); String library_name = get_library_name(needed_name); @@ -180,7 +180,7 @@ static Result<void, DlErrorMessage> map_dependencies(const String& name) static void allocate_tls() { s_total_tls_size = 0; - for (const auto& data : s_loaders) { + for (auto const& data : s_loaders) { dbgln_if(DYNAMIC_LOAD_DEBUG, "{}: TLS Size: {}", data.key, data.value->tls_size_of_current_object()); s_total_tls_size += data.value->tls_size_of_current_object(); } @@ -198,7 +198,7 @@ static void allocate_tls() auto& initial_tls_data = initial_tls_data_result.value(); // Initialize TLS data - for (const auto& entry : s_loaders) { + for (auto const& entry : s_loaders) { entry.value->copy_initial_tls_data_into(initial_tls_data); } @@ -277,7 +277,7 @@ static void initialize_libc(DynamicObject& libc) } template<typename Callback> -static void for_each_unfinished_dependency_of(const String& name, HashTable<String>& seen_names, bool first, bool skip_global_objects, Callback callback) +static void for_each_unfinished_dependency_of(String const& name, HashTable<String>& seen_names, bool first, bool skip_global_objects, Callback callback) { if (!s_loaders.contains(name)) return; @@ -289,13 +289,13 @@ static void for_each_unfinished_dependency_of(const String& name, HashTable<Stri return; seen_names.set(name); - for (const auto& needed_name : get_dependencies(name)) + for (auto const& needed_name : get_dependencies(name)) for_each_unfinished_dependency_of(get_library_name(needed_name), seen_names, false, skip_global_objects, callback); callback(*s_loaders.get(name).value()); } -static NonnullRefPtrVector<DynamicLoader> collect_loaders_for_library(const String& name, bool skip_global_objects) +static NonnullRefPtrVector<DynamicLoader> collect_loaders_for_library(String const& name, bool skip_global_objects) { HashTable<String> seen_names; NonnullRefPtrVector<DynamicLoader> loaders; @@ -305,7 +305,7 @@ static NonnullRefPtrVector<DynamicLoader> collect_loaders_for_library(const Stri return loaders; } -static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> load_main_library(const String& name, int flags, bool skip_global_objects) +static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> load_main_library(String const& name, int flags, bool skip_global_objects) { auto main_library_loader = *s_loaders.get(name); auto main_library_object = main_library_loader->map(); @@ -333,7 +333,7 @@ static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> load_main_library(co if (loader.filename() == "libsystem.so"sv) { VERIFY(!loader.text_segments().is_empty()); - for (const auto& segment : loader.text_segments()) { + for (auto const& segment : loader.text_segments()) { if (syscall(SC_msyscall, segment.address().get())) { VERIFY_NOT_REACHED(); } @@ -367,7 +367,7 @@ static Result<void, DlErrorMessage> __dlclose(void* handle) return {}; } -static Optional<DlErrorMessage> verify_tls_for_dlopen(const DynamicLoader& loader) +static Optional<DlErrorMessage> verify_tls_for_dlopen(DynamicLoader const& loader) { if (loader.tls_size_of_current_object() == 0) return {}; @@ -396,7 +396,7 @@ static Optional<DlErrorMessage> verify_tls_for_dlopen(const DynamicLoader& loade return DlErrorMessage("Using dlopen() with libraries that have non-zeroed TLS is currently not supported"); } -static Result<void*, DlErrorMessage> __dlopen(const char* filename, int flags) +static Result<void*, DlErrorMessage> __dlopen(char const* filename, int flags) { // FIXME: RTLD_NOW and RTLD_LOCAL are not supported flags &= ~RTLD_NOW; @@ -451,7 +451,7 @@ static Result<void*, DlErrorMessage> __dlopen(const char* filename, int flags) return *object; } -static Result<void*, DlErrorMessage> __dlsym(void* handle, const char* symbol_name) +static Result<void*, DlErrorMessage> __dlsym(void* handle, char const* symbol_name) { dbgln_if(DYNAMIC_LOAD_DEBUG, "__dlsym: {}, {}", handle, symbol_name); |