From nobody Fri Apr 08 01:25:28 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8331D1A837C4; Fri, 8 Apr 2022 01:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZLCs1Q0gz3FM9; Fri, 8 Apr 2022 01:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649381129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEeyFRFWdcbcQup8zVOW7+lfvvXa0355TM1N6BZPW50=; b=W1EGbOyH7qrbWfGzgHT7zJqePsu8kXe5iOjQJA1IFbH2CiI+OG+m3B+pjnXrcVCG6J1iHr 3+JacykKcXnhmyEwgrK48KVa3iRQDhDxwuiFw5Vl/p0OnX2Hd14V/D48UB/jCFN7k7qSZY QriG5v9RiGh1zf+MWDkkMcb344WFbzacO/csOI954hXO8SaVRajbjbAs+UpYD9TYzkEszr tNi4EFw2c6y1T8riSOLjr9BMiAttBCOHEy87zH1iNP5IDeCw/as8stFBLs6Nl+C7ehnx5p sPDP9NgRNaSoi7lraBvGZAQnBbYFyZupTAit9IijRwiZWDgC8gn/qIEXkv21EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4BA01B2F3; Fri, 8 Apr 2022 01:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2381PSFu095191; Fri, 8 Apr 2022 01:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2381PSQ7095190; Fri, 8 Apr 2022 01:25:28 GMT (envelope-from git) Date: Fri, 8 Apr 2022 01:25:28 GMT Message-Id: <202204080125.2381PSQ7095190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 739e497145e6 - stable/13 - rtld trace_loaded_objects(): use bool for the list_containers variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 739e497145e6c3e9ef145bf77017788f1da1abb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649381129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEeyFRFWdcbcQup8zVOW7+lfvvXa0355TM1N6BZPW50=; b=uIxWJ6OkqyYQBOxR96qdGHuJd9fWUzQHl837kgC/E7ip9v6lOPnRCrFInE0MokW4WutWL7 RSWs8dpLn2zhrvMbAopuUJPtnVsmu6Jo8zBPAJNgIFarrNKmvo2L+FUEbrF5AVsHRuphQf mdUr0I0LCL7HD7T9SkvKEjRjmgoEKwDAo1P/8LDDRIhzPC8Jn/MgbQyLlVi6mzHAp2rVm2 inui4JE6lvYZJWfWa6Ew0yaZwMxLv00YlV0T1Gtju9L1wPFTcFjfrRjIuGG/YvAB0zYjz4 LQVUT447GHG8F13PVcBclXS+JS+ck4nb0wkXTLxnmj8MnyeuNigPxjhwlRcwCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649381129; a=rsa-sha256; cv=none; b=vrNR79tIcg7aWJLnOafEEtmB4LLPeQbTficz5cLGaK+jaqIdzMtFNOMMNXuJIG3NwiwvP+ yG437a3fEOOaRjLRr0CigauN8rdoitkxvh7XuBF0BSRQpMakUpYZ5Swx78bM7XI4LDvUIN ixwTa6+N3Fb4kHnaEbT0o9b5e3UzqhUpFdScB/ZSHb6xS5A0a1QKtjhczfVa4e4voFoAH4 K35IttUZhHO5mAe0JL6m+17wQmhN3e/7vY4Lqj6SLItpmwLaJURGOmjeuLPzat9l8QtpOZ uHd7A0hI7PFcsL81lKKThWhPI/7rVOTWp6wH795+EhRoZs7YcIvaa2oCVznqjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=739e497145e6c3e9ef145bf77017788f1da1abb5 commit 739e497145e6c3e9ef145bf77017788f1da1abb5 Author: Konstantin Belousov AuthorDate: 2022-03-30 22:17:59 +0000 Commit: Konstantin Belousov 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;