git: 6880edbfd5aa - main - rtld: fix indentation of multiline conditional

Brooks Davis <[email protected]> Mon, 03 Aug 2026 16:47:56 +0000
Newsgroups gmane.os.freebsd.devel.cvs.src
Message-ID <6a70c63c.433b1.73f4f775__6874.54832238785$1785775699$gmane$org@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 <[email protected]>
AuthorDate: 2026-07-17 09:08:28 +0000
Commit:     Brooks Davis <[email protected]>
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");