From nobody Tue Feb 13 14:24:39 2024 X-Original-To: dev-commits-src-main@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 4TZ3Vw2KGsz5BQ3Y; Tue, 13 Feb 2024 14:24:40 +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 4TZ3Vw1RXzz4R0n; Tue, 13 Feb 2024 14:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707834280; 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=0idwtNl1gktbVPcjepGxmRR6NqImV3HOWep/8wwRrOM=; b=YrlJX6c1VIPv3PGfmAjzdt3QxEyfhNu5A/LxbU4HOsE13JChlih7hbGgFzamsMigvYYMYz MWZVsC/oj1DDNhlZfQ1ToHsv8XR9Toafxt/UhF8wpA850yOgrkHkNw8tVmeRzwZ+bft5xL TqlOm4SyGXLWwYj0xSeCqBIHJGc6/Fhww/6dyf4FPqkDKjcAFuQkcMV+s9G/8d3FY2T5d5 dICrDyYNc+TKcyaLAlobBp/B50rveJx7fVKAQ6DetcjmJXfWrz7lS9yBjudaLl+xMp6TQD SuPuGWO6AT+OXT8gcx5lWpho/lI4/gRT7DjrqW1H1G8jxtwAo8kRtG3zpb8xsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707834280; a=rsa-sha256; cv=none; b=hFTz88OFAHNiW1LPAi5WyH91JtTLEW95erkIqYv0XMMt6P1GyNSjh8zGfXs9dV9XYhB3KJ i0HErN9fhLjg5zlncY56T+zCFhNic6AC4EU/I+KX1ew1dqYGKQgkfiXL9HzNemyCIt4rQL YQLQ2chXF71Ohfu1WVTBWZvKYyqcYgdEd2PgOR4JNV3uDLSgAMV8WxDw348LGfwR+lRBgE SVe932eva34tQmdqzsEInWaNRf3d0EUTkArcwo1+OgqGIBT23ALB8uebZYIDElLa0+NRCr 6sGj2ohmm9kRWPcSl8kr07sGrryEGq8x2QALq2+3SOJqwrjZQuYynfyCFsCLaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707834280; 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=0idwtNl1gktbVPcjepGxmRR6NqImV3HOWep/8wwRrOM=; b=lu6n5hqhDbXNyJmuLU5YLBDfcWwSTWquSVs8XQ+rCZKQrrsvzkjcP58o2DNEc0vUIw1AAL S6ogy7dlrh6jpz6RtGmcCZIkFtdyf4FKd37Vy6Cb6wgGEIDpZ+Efnm99efq1f7opOmce7v wiYM8tfOu1Uxb3w66L2hiQPx6+aPUk2ZvEHlGLdHCMRzQzT1CpIvHPZMpa23p8+vGPOI92 DSLpJEAoeYLuGwevKCPa1rPP8Zzb63DZ1rlGl1ZYaJ5e0TZLNEC5WdQwwnzNq8XmW6xufI KgGSlek36kA0Vu+4abzV1EjboCZeT656OTHiiykfL0YsnvCZjgR5FX/iNrfJQg== 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 4TZ3Vw0H9GzJX8; Tue, 13 Feb 2024 14:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DEOdtj001328; Tue, 13 Feb 2024 14:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DEOdjb001325; Tue, 13 Feb 2024 14:24:39 GMT (envelope-from git) Date: Tue, 13 Feb 2024 14:24:39 GMT Message-Id: <202402131424.41DEOdjb001325@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: 30b5f6b33b35 - main - rtld load_filtees(): reindent and reduce block nesting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 30b5f6b33b35623e6b6aa1d27a78311e199fa602 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30b5f6b33b35623e6b6aa1d27a78311e199fa602 commit 30b5f6b33b35623e6b6aa1d27a78311e199fa602 Author: Konstantin Belousov AuthorDate: 2024-02-13 01:19:43 +0000 Commit: Konstantin Belousov 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