From nobody Fri May 2 07:34:19 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 4ZpjNW6XMxz5vGxY; Fri, 02 May 2025 07:34:19 +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 4ZpjNW4PNWz3rsV; Fri, 02 May 2025 07:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746171259; 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=bDR2Wrcgxl7SD22nZh4ZODWdeDIgQ4+df+7TbvkvDJg=; b=BV6vEG0Zj+cql4RtDJQ/PXvX+8j3rZaHDIH9dF45hM3PZXG1DzRnoT5t/RqUvwlvnT2zRy XXMD0d+vA67kbg9JDezwkOs5A1g0NJ2QxEqyGC06Sg8lpJsPyj68YU6MUo7sOq0x8zBc4n IIYKYKHMx7AwKkW0WAe9w8E8U6Hvs7TXm1krFy2ApdN8Xy1NqDDTQdZaKw3gLpKtpDrqss p/WL5o9zxicqOTJxDdyx7QJrB3pa3XJrd3PztZEWv4AwzmqrBx/35GRz1T92L/TMil41Ta 4yF/1WofDN0ajetKo/H/VdDwmYT09zNMfTCVhbV2TFlNJJcmgmqKioPo0lAfYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746171259; 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=bDR2Wrcgxl7SD22nZh4ZODWdeDIgQ4+df+7TbvkvDJg=; b=jdSbdVqu6sFDMcJMdkkwUm1CY9WTeHPDcuUK0zPLrEYC/Z5GnCndo0UKBD8nurDkU+5wR/ ySCKQdwjlMGa8YsjwUOva7MjqWp94qAR2SIbPBuW3maSBnu2nfqmcukGYaFVkgiIKAxFI6 cTsKE8nnNFgactXvqtdZoNgErknAFbO/6gNPfiMfqlRjwiDi7ApNW6AAM/SzWfWXRB/Scw EDMbTb2JNQFaTxq0w5d0z8D9MlFrzrymxApAEdEHuUXXe9rLumTBjY2tTWacimnwC0ZiAE ZzFSg+H9UEMVExpXNsoxaocMnKb+3Gc2PKSLnxSmkAmrp/cnZRrtU9GPnTzNfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746171259; a=rsa-sha256; cv=none; b=Q27U4aqm1bySzczkZ7DfMorXhLrwIKunIEPkoHXATCqje4cTr63sB7NotX0k6BnmUy6PC9 i83n2zKTfompbiemAHDQPzwu0t004ivsZREcvE+qwH7md40QeJigqodUN2/nWl+nsXMRW7 oGQTy60+snU+Z1Qmq0lMV5Kqwr84Z3fMIv1+fG7zEIk/NPD7bD59eWhHJcbGMBOd89xMn6 eQ+M1jIcOxy+Hjsuk2P3G1jUalIYjdX2GhRFd7/7PiYXPxC/sSY05XVz/sQBwQ3Not8H5j DCXcBMp2BYrs38gKNeVVc2SicGC6j9VzaX83pAuOpdlxJYymEmTdsQlKfjzBsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpjNW3qkwz13pL; Fri, 02 May 2025 07:34:19 +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 5427YJBZ081103; Fri, 2 May 2025 07:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5427YJHL081100; Fri, 2 May 2025 07:34:19 GMT (envelope-from git) Date: Fri, 2 May 2025 07:34:19 GMT Message-Id: <202505020734.5427YJHL081100@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: 100dd7d5c7bc - main - rtld: some style in rtld_lock.c 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: 100dd7d5c7bc01a398982333cda4919cfa2bd24b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=100dd7d5c7bc01a398982333cda4919cfa2bd24b commit 100dd7d5c7bc01a398982333cda4919cfa2bd24b Author: Konstantin Belousov AuthorDate: 2025-05-01 17:54:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-02 07:32:56 +0000 rtld: some style in rtld_lock.c --- libexec/rtld-elf/rtld_lock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c index 323bb7494c32..40fa724b6227 100644 --- a/libexec/rtld-elf/rtld_lock.c +++ b/libexec/rtld-elf/rtld_lock.c @@ -251,7 +251,7 @@ rlock_acquire(rtld_lock_t lock, RtldLockState *lockstate) if (lockstate == NULL) return; - if (thread_mask_set(lock->mask) & lock->mask) { + if ((thread_mask_set(lock->mask) & lock->mask) != 0) { dbg("rlock_acquire: recursed"); lockstate->lockstate = RTLD_LOCK_UNLOCKED; return; @@ -267,7 +267,7 @@ wlock_acquire(rtld_lock_t lock, RtldLockState *lockstate) if (lockstate == NULL) return; - if (thread_mask_set(lock->mask) & lock->mask) { + if ((thread_mask_set(lock->mask) & lock->mask) != 0) { dbg("wlock_acquire: recursed"); lockstate->lockstate = RTLD_LOCK_UNLOCKED; return;