git: 739e497145e6 - stable/13 - rtld trace_loaded_objects(): use bool for the list_containers variable
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Apr 2022 01:25:28 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=739e497145e6c3e9ef145bf77017788f1da1abb5
commit 739e497145e6c3e9ef145bf77017788f1da1abb5
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-03-30 22:17:59 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-04-08 01:25:17 +0000
rtld trace_loaded_objects(): use bool for the list_containers variable
(cherry picked from commit db0372808ad7575bd467049daa25a4415c6b2bab)
---
libexec/rtld-elf/rtld.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index b7461faeb878..dea6e3c8c037 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -5040,10 +5040,11 @@ trace_print_obj(Obj_Entry *obj, const char *name, const char *path,
static void
trace_loaded_objects(Obj_Entry *obj)
{
- const char *fmt1, *fmt2, *main_local, *list_containers;
+ const char *fmt1, *fmt2, *main_local;
+ bool list_containers;
trace_calc_fmts(&main_local, &fmt1, &fmt2);
- list_containers = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_ALL);
+ list_containers = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_ALL) != NULL;
for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
Needed_Entry *needed;