From 31643c4ee3dd8c8e9c74247f0db353051c1bec3f Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 28 Oct 2022 17:00:32 +0200 Subject: [PATCH] LibELF: Prepend `resolve_and` to one of the `map_library` overloads Having two functions that are named the same and whose behavior regarding "should probably get a full path" and "does explicitly not require a full path" is quite confusing, especially since that difference is dictated through the other passed arguments. --- Userland/Libraries/LibELF/DynamicLinker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibELF/DynamicLinker.cpp b/Userland/Libraries/LibELF/DynamicLinker.cpp index 13caea778a..8fd45a3905 100644 --- a/Userland/Libraries/LibELF/DynamicLinker.cpp +++ b/Userland/Libraries/LibELF/DynamicLinker.cpp @@ -139,7 +139,7 @@ static Optional resolve_library(String const& name, DynamicObject const& return {}; } -static Result, DlErrorMessage> map_library(String const& name, DynamicObject const& parent_object) +static Result, DlErrorMessage> resolve_and_map_library(String const& name, DynamicObject const& parent_object) { if (name.contains("/"sv)) { int fd = open(name.characters(), O_RDONLY); @@ -183,7 +183,7 @@ static Result map_dependencies(String const& name) String library_name = get_library_name(needed_name); if (!s_loaders.contains(library_name) && !s_global_objects.contains(library_name)) { - auto result1 = map_library(needed_name, parent_object); + auto result1 = resolve_and_map_library(needed_name, parent_object); if (result1.is_error()) { return result1.error(); } @@ -476,7 +476,7 @@ static Result __dlopen(char const* filename, int flags) auto const& parent_object = **s_global_objects.get(get_library_name(s_main_program_path)); - auto result1 = map_library(filename, parent_object); + auto result1 = resolve_and_map_library(filename, parent_object); if (result1.is_error()) { return result1.error(); }