From nobody Fri Apr 01 00:51:31 2022 X-Original-To: dev-commits-src-all@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 F002D1A52FAD; Fri, 1 Apr 2022 00:51:31 +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 4KV1nv2fyRz3nMM; Fri, 1 Apr 2022 00:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648774291; 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=Krrcwr1VDIhw1zRvETETmZNmCf8DUS8DPCYR5BLZhFA=; b=BRq2zK0aaeSgVv2THAAXOuVnFSmp3EudTPtACUApvQtsmaol3lQj6+z5a8bvmbgPdPiujx T8x+kPEBsS4H0hmAe6pKNZB5nXTAjNy2wmMSBjYuAkp/eVvxggwU9dsUl0IoIQzWFYG0X1 h6CwREY6FdPnexgeDANSllnDpVWitloQehys7g2yQnnmruyw+5sUxp2uLP10Qarl97smou cb2YWxIFrdLrEoO3xHhRBTO2Xj6qzV8sDnjhwZj7qFEat2+zaTIoggdHqsFN3IAu98vB+0 5Y0QYaqsz7CK0ccpHGqfHdV2cKsAveDFlFOAfX05CDDdQrlM0FMGLbre/FGu7Q== 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 2B7002263; Fri, 1 Apr 2022 00:51:31 +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 2310pVlB012643; Fri, 1 Apr 2022 00:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2310pVrX012642; Fri, 1 Apr 2022 00:51:31 GMT (envelope-from git) Date: Fri, 1 Apr 2022 00:51:31 GMT Message-Id: <202204010051.2310pVrX012642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: db0372808ad7 - main - rtld trace_loaded_objects(): use bool for the list_containers variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: db0372808ad7575bd467049daa25a4415c6b2bab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648774291; 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=Krrcwr1VDIhw1zRvETETmZNmCf8DUS8DPCYR5BLZhFA=; b=lZJBDEUj1VkPIekaAwiZl0GzJ08mKJQgWqH0bPuzSU3KkpjI8JZ6ilE/FC5MYPK2d2WaMv SHqOaZZnKNufz+6LMC8j3ZOcp2pfSHkbqIMxXvUq5e6P2yGdHiBBmMs/CZnZTTcsmuDW5g Yc6usKiIhUsdqu7jeSG0otOnNgPKGqreHp9AvYQr2qA+OVsWJy3vFT4wqFdeQ5QFHxVGKg Tv84m+zvsoJQ5YXl+dDQ6BfscxN8e+v25ZRzPnbhJ/GnvssczwGNLzEwxJphL2fPptz1Q8 xCaIBgjN019kHfSTZjXhppjPT67GgkaeltQ1C0oXlsqeeLLWK6/sWUf17yXe+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648774291; a=rsa-sha256; cv=none; b=puIP92lLyUjU3r4sae0RoBMNoJrgN+m59ybhwmEVVJeXfyTsf60OYUokSQhc91A1xm/F9G MHlPK6aIU1zlmJD4JDI9KuuA6EgpZERlu1ST5yQJFCZ7HQTjuSXpoG9bUEuk5LzN1wdQgS NGyWqDz10C1KngeJYyPpdOu4SiHjKc8ye59gf12/4lG+lU5OEYmJf0GAoHhMssqt7JIfVP HK0BXmfmDE5OMqbAdTjNF5aSTSijoWWKfE2rc0/7J83t0sEL6E61aVEc9BHRblpbPSXUDh T+gMTdIAea92EY1AYCIzog4GnIHV/lbxL0zYfvvaIb8V7w50T8Tj8ehB9KACng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=db0372808ad7575bd467049daa25a4415c6b2bab commit db0372808ad7575bd467049daa25a4415c6b2bab Author: Konstantin Belousov AuthorDate: 2022-03-30 22:17:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-01 00:51:22 +0000 rtld trace_loaded_objects(): use bool for the list_containers variable Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34716 --- 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 becfe49e4531..3860e1dba3eb 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4994,10 +4994,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;