git: 3d49b2e4d730 - stable/13 - rtld load_filtees(): reindent and reduce block nesting
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Feb 2024 00:26:16 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=3d49b2e4d730926b47387b93515fc78a478d7ea6
commit 3d49b2e4d730926b47387b93515fc78a478d7ea6
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-02-13 01:19:43 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-02-29 00:24:43 +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 56fca9cd60b2..a4278e70e872 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -2616,13 +2616,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