From nobody Mon Aug 3 16:47:56 2026 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 4hDMzw59zRz6mWBC for ; Mon, 03 Aug 2026 16:47:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDMzw29tjz3cRf for ; Mon, 03 Aug 2026 16:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785775676; 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=VRiuYPAKfMSdRU/0IideVdssBRBDebWdDXH8M9fVM64=; b=vPkImolv9A5pSqMTI3lPxNkK6ndbDd4ZLMh5AzA9WGPpOKE3D5sIXn7w/FDCI1AOeFeJXH tvwrBHUc8zVVMyuFuXFSFhp5Z7YkTJ2KTRdi+/bHykt+lu9HgfJ+qsk0BCeFLP5huAsYUi /zFdM3ClarGdjc1tkoDoAdWX+WIbtz1luKkLYNzQs7lQHUhNJFNzbY5CXBdqdRxLuM9upI osoz4cYs/KNRYSXVJ1NWy6Qtia2Umayfw0jJVzBB9y9cPMr6qlASKA0zmDdI+vXSfU0TAI aCkyg6rp6I/VuBSpkiLeqAB3pFgVUmVSxZ+xrNHPrxzevOAFdDioldFxNRwzsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785775676; a=rsa-sha256; cv=none; b=e/JOCfulZE+CvYrwyrJO7jeQSxiDNd2g6XbDqXOD1rSY0QfRXYCS8lqR+uRKL442yrkHGv spiVNd0Nk7WPyR3IAk1gni61brBI/C/DfX1hOZ0nhg81EyBynpwgSX3pWG9xQqgqDfS/E8 FcxPi1/DL8Bc7S4q4c9s5mq5hPw44Umo8h271BHmOji8Ytir4UB1zC/hJt2QJxkTdCZXKi 1qDOoln7NOB5ldfXGUUiBZMW/ZSmawT7rRlhEdBJT4JakuVrvD/qVkowOoh9LZO0NHkkIb DlRIwV48x5dWTPZcMkVXECsJKb54b7i0xtNZcXXS65mvBpL40TTSDhWxL22fXw== 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=1785775676; 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=VRiuYPAKfMSdRU/0IideVdssBRBDebWdDXH8M9fVM64=; b=xXXKZ8PZr3SjU7g/NKEB4H6xqNRGG+yTzF0ofhtR73oeDaZxszPeHjNf+hoF+by0ykvMvQ LhTeFZpmRSp0CLQ/UQo729fl6z43u4Qf6GPQ3J6nTIYIaUjf3h5q/8YvCd9GJJCOuBFoAj X1lCw2d00kTeywXbdzReLoZfbOCkPJioP2UPvnPB9KijwGcix+x2HfodtsHgn8RD/4S4Zy AayoJ82oTlKV4WSpkVKXxdZf6Q5SCriF/mNX8W1g3XWbfSQTdfo6r8l4eUe0EaXk+m4yEy wocZ+4O0OHJHCjNrdQLwConPX4FzQC0iKB9HBF5BUBGPSbUWVkhOffu28q6rdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDMzw1CSgz188F for ; Mon, 03 Aug 2026 16:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 433b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 16:47:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6880edbfd5aa - main - rtld: fix indentation of multiline conditional 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6880edbfd5aa1fbe96ffdf53e323807e18b8dc53 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 16:47:56 +0000 Message-Id: <6a70c63c.433b1.73f4f775@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6880edbfd5aa1fbe96ffdf53e323807e18b8dc53 commit 6880edbfd5aa1fbe96ffdf53e323807e18b8dc53 Author: Brooks Davis AuthorDate: 2026-07-17 09:08:28 +0000 Commit: Brooks Davis CommitDate: 2026-08-03 16:47:32 +0000 rtld: fix indentation of multiline conditional Fixes: 7e2f38311e62 ("rtld-elf/rtld.c: apply clang-format") Sponsored by: Innovate UK --- 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 bb4314c03039..361a2d3b905d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -935,8 +935,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) dbg("tcb_list_entry_offset %zu", tcb_list_entry_offset); if (relocate_objects(obj_main, - ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, - SYMLOOK_EARLY, NULL) == -1) + ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, + SYMLOOK_EARLY, NULL) == -1) rtld_die(); dbg("doing copy relocations");