git: 2a240805dfe9 - main - rtld: fix indent in dlopen_object()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Apr 2025 19:25:05 UTC
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=2a240805dfe94d4cfba7e4b0815ac6124c1481c3
commit 2a240805dfe94d4cfba7e4b0815ac6124c1481c3
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-04-19 10:35:43 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-04-23 19:04:14 +0000
rtld: fix indent in dlopen_object()
Sponsored by: The FreeBSD Foundation
---
libexec/rtld-elf/rtld.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 2346c6eae9f6..13b24a259bec 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -3824,27 +3824,25 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags,
if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) ==
0 &&
obj->static_tls && !allocate_tls_offset(obj)) {
- _rtld_error("%s: No space available "
- "for static Thread Local Storage",
+ _rtld_error(
+ "%s: No space available for static Thread Local Storage",
obj->path);
result = -1;
}
if (result != -1)
result = load_needed_objects(obj,
- lo_flags &
- (RTLD_LO_DLOPEN | RTLD_LO_EARLY |
- RTLD_LO_IGNSTLS | RTLD_LO_TRACE));
+ lo_flags & (RTLD_LO_DLOPEN | RTLD_LO_EARLY |
+ RTLD_LO_IGNSTLS | RTLD_LO_TRACE));
init_dag(obj);
ref_dag(obj);
if (result != -1)
result = rtld_verify_versions(&obj->dagmembers);
if (result != -1 && ld_tracing)
goto trace;
- if (result == -1 ||
- relocate_object_dag(obj,
- (mode & RTLD_MODEMASK) == RTLD_NOW, &obj_rtld,
- (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0,
- lockstate) == -1) {
+ if (result == -1 || relocate_object_dag(obj,
+ (mode & RTLD_MODEMASK) == RTLD_NOW, &obj_rtld,
+ (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0,
+ lockstate) == -1) {
dlopen_cleanup(obj, lockstate);
obj = NULL;
} else if (lo_flags & RTLD_LO_EARLY) {