Date: Tue, 6 May 2025 17:15:04 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: 3d4c3eb6f23f - main - rtld: style Message-ID: <202505061715.546HF4gT089258@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=3d4c3eb6f23faa9457fe4af4515c9835cb2f43b0 commit 3d4c3eb6f23faa9457fe4af4515c9835cb2f43b0 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-05-03 07:15:17 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-05-06 17:14:56 +0000 rtld: style --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 59d29888d93d..0575ce19d476 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2590,7 +2590,7 @@ initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list) /* Add the object to the global fini list in the reverse order. */ if ((obj->fini != (Elf_Addr)NULL || - obj->fini_array != (Elf_Addr)NULL) && + obj->fini_array != (Elf_Addr)NULL) && !obj->on_fini_list) { objlist_push_head(&list_fini, obj); obj->on_fini_list = true; @@ -3817,7 +3817,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (obj != NULL) { obj->dl_refcount++; - if (mode & RTLD_GLOBAL && + if ((mode & RTLD_GLOBAL) != 0 && objlist_find(&list_global, obj) == NULL) objlist_push_tail(&list_global, obj);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505061715.546HF4gT089258>