From nobody Wed Apr 23 19:25:05 2025 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 4ZjTZn62mlz5tmLg; Wed, 23 Apr 2025 19:25:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjTZn3nVGz3vcD; Wed, 23 Apr 2025 19:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745436305; 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=21GkkJdIOgZ7Yaqd+AWEVLviyBf6ifD0BHj0gCFIGPY=; b=KAGfjoAbhHR1Y3naGbUSEYa143UjaldtxTo0IzX2V2q5Ef4cSTWeMf7OjDaONp6iOkq1qj MD2UjkLW8Hfutu90+vNU9EWfxCyh9FWD/VvwbqKshoytymjxdVYvikk5tzUFtPjP+3NNDg IwuyDGGA1o3mlk1y1ST5zHiVUX5KH4Ar2L/1QcDrb6PWUITbXBkqf/me1seuIGrwBIfYPU AkCr8hN3WoCqCWwFudeqVdciFOoUM5bOp5CWQs5tF4HwKFPw4C2TkuxIb9rVEMwAa7C+sc pthUq1nyOgLHTJrAnGQAE3hqWy2RHETob2l1P63zvnMdVHlysELB8FyBecaEvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745436305; a=rsa-sha256; cv=none; b=UwCyWZngga05MxC7AYFDNnOZzuu+yyE1oaQSCAflLJx4fcHZ8dYLN+hL32tVCmqzTX50XR J+LYi+cUipA23fXon2bXOn+Gq9d+p3SCGuOOCvnK/J5DjoJeeNYscjy7dtwArYcBmVh87C WDHNGp/dzGFZN+cVHWY5yMMu1mmk28IRtEN+yl1SvpFo+gF/SfSiE5twSkMFedCSMdwXJp o28tazRmG9g0Xi5vzfjftVW0URCLY+SMLIjIAubcBfFf4hLXhdSHY0ZffRb8r/TPJ64j/p Z1VK8Cal7mB+82lVWWFESxRR5NSc5BxORXtDQT+QrAovPXM5fa5pbpABVNnnTg== 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=1745436305; 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=21GkkJdIOgZ7Yaqd+AWEVLviyBf6ifD0BHj0gCFIGPY=; b=Q8Vx5mQ1QImmi0zi2Fv1rvZO/mJInlK4nCDR9qPcZQPrLuajJV97ZjLEqywJe2ekGwhSFW lGBttU52c3YKl4eW/1pzk3WzTHNCb02pOD07OQCe12wbB9wfvs2n6lQ2wB/AUXIk4iE4iq /XVPu/TBm00E7euUheClpb4Tnushh3Y2eddUdk9da+qNnlGf4/NNfLzzPREG2w//2EJ1fT D4qLssZYPN3JaC3manByn1vrce/133q6wP31WaYhmOnI6yWW2v1n3oAeYN9gXvm1UJGUyE WBPq5IFKorjb4js3GOd/Eltkf27GVj16LM9/y9+mKH8JKbjUthv3Dh3v6IJ3Iw== 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 4ZjTZn2slXz2MF; Wed, 23 Apr 2025 19:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53NJP5jD020331; Wed, 23 Apr 2025 19:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NJP50L020328; Wed, 23 Apr 2025 19:25:05 GMT (envelope-from git) Date: Wed, 23 Apr 2025 19:25:05 GMT Message-Id: <202504231925.53NJP50L020328@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: 2a240805dfe9 - main - rtld: fix indent in dlopen_object() 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 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: 2a240805dfe94d4cfba7e4b0815ac6124c1481c3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2a240805dfe94d4cfba7e4b0815ac6124c1481c3 commit 2a240805dfe94d4cfba7e4b0815ac6124c1481c3 Author: Konstantin Belousov AuthorDate: 2025-04-19 10:35:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-23 19:04:14 +0000 rtld: fix indent in dlopen_object() Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 2346c6eae9f6..13b24a259bec 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3824,27 +3824,25 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { - _rtld_error("%s: No space available " - "for static Thread Local Storage", + _rtld_error( + "%s: No space available for static Thread Local Storage", obj->path); result = -1; } if (result != -1) result = load_needed_objects(obj, - lo_flags & - (RTLD_LO_DLOPEN | RTLD_LO_EARLY | - RTLD_LO_IGNSTLS | RTLD_LO_TRACE)); + lo_flags & (RTLD_LO_DLOPEN | RTLD_LO_EARLY | + RTLD_LO_IGNSTLS | RTLD_LO_TRACE)); init_dag(obj); ref_dag(obj); if (result != -1) result = rtld_verify_versions(&obj->dagmembers); if (result != -1 && ld_tracing) goto trace; - if (result == -1 || - relocate_object_dag(obj, - (mode & RTLD_MODEMASK) == RTLD_NOW, &obj_rtld, - (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0, - lockstate) == -1) { + if (result == -1 || relocate_object_dag(obj, + (mode & RTLD_MODEMASK) == RTLD_NOW, &obj_rtld, + (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0, + lockstate) == -1) { dlopen_cleanup(obj, lockstate); obj = NULL; } else if (lo_flags & RTLD_LO_EARLY) {