Date: Tue, 13 Feb 2024 14:24:39 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 30b5f6b33b35 - main - rtld load_filtees(): reindent and reduce block nesting Message-ID: <202402131424.41DEOdjb001325@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30b5f6b33b35623e6b6aa1d27a78311e199fa602 commit 30b5f6b33b35623e6b6aa1d27a78311e199fa602 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2024-02-13 01:19:43 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2024-02-13 14:23:55 +0000 rtld load_filtees(): reindent and reduce block nesting Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43858 --- 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 31560b79f19e..dfd9e74407ed 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2582,13 +2582,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402131424.41DEOdjb001325>