From nobody Fri Jun 26 16:48:19 2026 X-Original-To: dev-commits-src-all@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 4gn1nv6mW8z6jmCL for ; Fri, 26 Jun 2026 16:48: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn1nv5pXKz4B78 for ; Fri, 26 Jun 2026 16:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782492499; 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=tsLjFlhWLIXVSmcDJ//y1FQmOKU4i0/mH9nnEQ2yBoU=; b=XXNN1tgBt6VZF63DpyMbQmVXqEqH0WeiHantEJxg5E8SLw9dcoTO1gnyQskIivUGq+PnGv eTob21avSLoHzuHCLdc0whXOzj+vra3n7HViwo562j4m8OwlaOb0Aam+3xfBBK1OnCm8lW TwiKCn9fN8nXhudp3wxvmRm6ofzPPy3Q51CzXPBuQ8/pXov8OcpD7hYXUzcO9awjUc+hHQ U0JeVkC7kwPHG/NCmDzYsF+oGaIG1O0ZVGJ9K+6TMMYf0I1WyRAWx20ZrMiEB1sATbk78c ZnfZFzs9B/P3+Xy8Bh5XdoQ3MdWSrWF9NdmEa93GnM7YRysazAF6dlIp+uUQpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782492499; a=rsa-sha256; cv=none; b=vsjexTd/4geeWugVe0v7gaEVJYo+Yz5uqJ3S9BkFvk1FwtvTupm5QozukTrktRrFgjvO22 XO5HWJIBZMbXzy0EmOhf0+Fy1ihDMexmkf/oleYjQ24kFGabzxCoXtfkg8Q3ObFAR2jVOF r3z37zzFpHShrD2GHZQ5A7Xhv6460a+3rsWcfvnK7HHLdA60dixqs5aOR7uNL7FYuVcAhR WyQ8zbClJYJ8a1GPTOPZfJujU1EP8CuPgpIaa8n0RGQ2kAfNJdELlJSpfVaf8UZ2bYKlDM OvjLVDcfxIKoPtKL4uiuHbURjJal3RRDgZ9IV/nNkYNzIqhbX+Pz1rZUGsb53g== 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=1782492499; 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=tsLjFlhWLIXVSmcDJ//y1FQmOKU4i0/mH9nnEQ2yBoU=; b=o6Q3LsZuG9VLjxbzrSVndvLExenEnMIJmhVNPQIAcnc7Qk2XidT07wSnjjtXGvI/2RQ3Xi Cs4V5kpPyMfXvTVP3TqVIu/HfSKzWJ+PrKkAQsNQlBc0YMaXPPomJ8XOZthwmcvccBUIqP Xx2wqU4JjnA6NQYPjoRtqnc+gE69trgVVbavWjykuc2AYTKKf3bPFXXBSC61Zzr1ZekFjl vmvgfQvBaDEbkfLy9TvChVE9X5V54Djqm1KvGngvw76XrGskujeOia3YvDI8Lcnb1fdCOz tH/kjmZdIPhi+g/jG9mwsnx4mc5eZpycUWKXeHor6+6dso5uhNFgv2c7pAPJlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn1nv424xzlrx for ; Fri, 26 Jun 2026 16:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:48:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b207b1562a2f - main - sys/systm.h: use __nodiscard consistently and correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b207b1562a2f099b4e763460891fa6761549091a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:48:19 +0000 Message-Id: <6a3ead53.33a8a.51592389@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b207b1562a2f099b4e763460891fa6761549091a commit b207b1562a2f099b4e763460891fa6761549091a Author: Brooks Davis AuthorDate: 2026-06-26 16:42:06 +0000 Commit: Brooks Davis CommitDate: 2026-06-26 16:42:06 +0000 sys/systm.h: use __nodiscard consistently and correctly __nodiscard is closer to (and sometimes expands to) [[nodiscard]] from C23 and C++17 so prefer it to the homegrown __result_use_check and put it in the right place so it is correct when expanded to [[nodiscard]]. Reviewed by: markj, emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D57882 --- sys/sys/systm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 88c25f06e0cb..e50b02bfb7cf 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -300,12 +300,12 @@ void *memmove_early(void * _Nonnull dest, const void * _Nonnull src, size_t n); ((__r >= __len) ? ENAMETOOLONG : 0); \ }) -int __result_use_check copyinstr(const void * __restrict udaddr, +__nodiscard int copyinstr(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len, size_t * __restrict lencopied); -int __result_use_check copyin(const void * __restrict udaddr, +__nodiscard int copyin(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len); -int __result_use_check copyin_nofault(const void * __restrict udaddr, +__nodiscard int copyin_nofault(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len); __nodiscard int copyout(const void * _Nonnull __restrict kaddr, void * __restrict udaddr, size_t len); @@ -329,9 +329,9 @@ long fuword(volatile const void *base); int fuword16(volatile const void *base); int32_t fuword32(volatile const void *base); int64_t fuword64(volatile const void *base); -int __result_use_check fueword(volatile const void *base, long *val); -int __result_use_check fueword32(volatile const void *base, int32_t *val); -int __result_use_check fueword64(volatile const void *base, int64_t *val); +__nodiscard int fueword(volatile const void *base, long *val); +__nodiscard int fueword32(volatile const void *base, int32_t *val); +__nodiscard int fueword64(volatile const void *base, int64_t *val); __nodiscard int subyte(volatile void *base, int byte); __nodiscard int suword(volatile void *base, long word); __nodiscard int suword16(volatile void *base, int word);