git: e43855c6f134 - stable/14 - rtld load_filtees(): reindent and reduce block nesting
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 18 Feb 2024 10:09:10 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=e43855c6f1346759b126d7c7ea247a9abcf0a2da
commit e43855c6f1346759b126d7c7ea247a9abcf0a2da
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-02-13 01:19:43 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-02-18 10:01:47 +0000
rtld load_filtees(): reindent and reduce block nesting
(cherry picked from commit 30b5f6b33b35623e6b6aa1d27a78311e199fa602)
---
libexec/rtld-elf/rtld.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 380b2696f41c..e71903ba5e12 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -2572,13 +2572,12 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags,
static void
load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate)
{
-
- if (!obj->filtees_loaded) {
+ if (obj->filtees_loaded)
+ return;
lock_restart_for_upgrade(lockstate);
load_filtee1(obj, obj->needed_filtees, flags, lockstate);
load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate);
obj->filtees_loaded = true;
- }
}
static int