From nobody Sun Feb 11 01:41:12 2024 X-Original-To: dev-commits-src-branches@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 4TXVfw2NfGz595F1; Sun, 11 Feb 2024 01:41:12 +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 4TXVfw1vC1z43V5; Sun, 11 Feb 2024 01:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707615672; 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=yRwLC+DkmKXVa53UFLdKhLDSpECPN8R9veE7OD58HZw=; b=J5/Mauzv6odAE1Ja4L8frssWKCpwW5nNIsU6yz+vMJbV8NM+ox6eB4dd16wdbDsIC2Szir EWwScSm7uF16UX6q7O3b2EbBkxLHzcvbktUFZNd34Fjo4BBOU4OMdaY/boIxS6amKCZKzS jc5aaU8Ujy9pEwR/SFP042nqQrwiTL1Eyb5erdCVAZTG8xG0CRc41KuCQGkfzMiUFUVEoK TVOA9ZpZtNTapvR6zCLcsvw32It5/RphPIpBMkVT2BqRs5o6vYf78444JM3TrX5+c1iiGK DVsiAD6iua8RflGJELigGB+mPIsvbnjzXIwndoxDoCb4brLd2AZXt9KjqQl02g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707615672; a=rsa-sha256; cv=none; b=S00lzdutyepUDog5WlhnBXNlLfQGX/GfjUpcFoPZLZzO/sD/tTDTxCX1NpgQkePsqh8uFt 2DIqEvbwr3+PsMXnqZvLrrIMXQlQ/eTHemkpf1bhUJVUkquJefucNPoYhTYT/Ycj055ErT Sv0iU1tmsp/Omkm21APikUdlwB7YibtwEsNDTzs5b+WlIiLXRrFt5OX2VSg2B8TBXWU8tD 7EUkfmDJ17d3voMLrUPk4v/ilKl3j+yL+qszevog0bRLT4Li5kBCFE5NxhdhYzn7sQDWh+ YXV8dcOj6O5OwRn6dtlEBcFoTDVbXvzNQuhIH0WIBSlWfuVnN05p+c/+Kf0UVA== 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=1707615672; 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=yRwLC+DkmKXVa53UFLdKhLDSpECPN8R9veE7OD58HZw=; b=FVok4jNwtE3Sr0ZC7NiPMPhH+B2vXk7bH/z/V86ZYW9T84rQP/ImMTrSGoMwQTExUiyF6L /bUDWJRwzzOhBaqe9CTM0/Ovk+C+I7egcJ+L7jU7I6aW821TX0TyMKt4HMJgOXJRKJWxU6 7dL/3vHtjVKuTcfrS8xKYR7BlENLYKNyq/sMerAlbaJ+NPwg/GOU9OePMHnJlGH2yQkESM 1/bpFLyDlJoUa+oy1eVqNvuZfe9OfN+ZP77bwL2gr1Z0wqnauJQFsx8TCPWPTYe+3p4Us0 qRtTNFhs4A1ql494PZ5aW8H3iQqj2yx5xQClCbwLQHgIgJ1HfXCettkmldX9Ew== 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 4TXVfw0xmKzgDs; Sun, 11 Feb 2024 01:41:12 +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 41B1fCX9066825; Sun, 11 Feb 2024 01:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B1fC0u066822; Sun, 11 Feb 2024 01:41:12 GMT (envelope-from git) Date: Sun, 11 Feb 2024 01:41:12 GMT Message-Id: <202402110141.41B1fC0u066822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 58ccdcc6ffc5 - stable/13 - libstdthreads: destroy mutexattr in mtx_init() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 58ccdcc6ffc5d053b92ba0069f02cfbe9ff498b6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=58ccdcc6ffc5d053b92ba0069f02cfbe9ff498b6 commit 58ccdcc6ffc5d053b92ba0069f02cfbe9ff498b6 Author: Hodong AuthorDate: 2024-02-04 10:14:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-11 01:40:28 +0000 libstdthreads: destroy mutexattr in mtx_init() PR: 276818 (cherry picked from commit a03f768612ad98a886458197c531a0b92203bf84) --- lib/libstdthreads/mtx.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/libstdthreads/mtx.c b/lib/libstdthreads/mtx.c index 719ba6486e41..3027a4e48c8d 100644 --- a/lib/libstdthreads/mtx.c +++ b/lib/libstdthreads/mtx.c @@ -43,7 +43,7 @@ int mtx_init(mtx_t *mtx, int type) { pthread_mutexattr_t attr; - int mt; + int mt, res; switch (type) { case mtx_plain: @@ -60,11 +60,12 @@ mtx_init(mtx_t *mtx, int type) if (pthread_mutexattr_init(&attr) != 0) return (thrd_error); - if (pthread_mutexattr_settype(&attr, mt) != 0) - return (thrd_error); - if (pthread_mutex_init(mtx, &attr) != 0) - return (thrd_error); - return (thrd_success); + res = thrd_success; + if (pthread_mutexattr_settype(&attr, mt) != 0 || + pthread_mutex_init(mtx, &attr) != 0) + res = thrd_error; + pthread_mutexattr_destroy(&attr); + return (res); } int