From nobody Thu Jun 4 11:51:06 2026 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 4gWNF7087fz6gcC1 for ; Thu, 04 Jun 2026 11:51:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWNF66YYmz3Q6V for ; Thu, 04 Jun 2026 11:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780573866; 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=IBQNQJTdoX3iHOxf3iJGy/sKmEFx1AVPPFHqUHwPXzk=; b=DYVA2HSb0+1zBF39UejJqer3rtWa7HRer/GwJNN4lrpGTutbB1F6eMlk291qZrt+2XBex8 wFLBo678lw7z9nlD3JrJQmqq6s+JBRgRfBk+/egb8EB0nR0qNlFXjNdWJKaL+H7fxSEZ/u dMbIc4dEpq1uVHYuqTIV+HqahnXS1+P7QjKSSjq/G65N6caL41O+hkyx0ONmQ7XU2hptx1 G3Bq3fXmS66l/uH+8Cfso5TYXLgq0zCRaqwRTSdzWlRqPHFMSgNoEf228CKK0xWdYcK9zr lWOfY6Uy2LLAB43HksIoPTm9K+EHl3OmX0iGBb7dcAgKJG2PQBCvLSpDP+9MQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780573866; a=rsa-sha256; cv=none; b=wp7iqPuWe0bgKpmgbo7pjE2FhTZQZeMzbYFNlDveBK2ZJqq2hvuHNbOjmZ/FVzsvc1xAzj gdAc93TQGrTmcPeH0HXAQAODd4pEVPoD3Xzq145nXcLghffkOusb4I3SIKpL+rHfKSXUgJ iI3uKklCMdYgUzCZ3q4S3p6BrJ0H0Z5QBssqmH0hBVhLu5FWfugPPYiszwO2Ip85Awzfzo ttsEBbctfo+kddiGtOnN6TTAVIV9B6YHQt1i3EdUhSipn+Pq79hec8neqQ8KYsVdopo0Qk hbxJYQA8seUYNoJAGRP8+/Hr6qtfWSmoWpSCBh5ISJxWK7WEp660DB8dgr++lQ== 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=1780573866; 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=IBQNQJTdoX3iHOxf3iJGy/sKmEFx1AVPPFHqUHwPXzk=; b=XPzWa4PPEEiXbLC1k9zUCTcna2dxkZWCxffhfCGygJ6aLyTX47dA8x4g+TpYHjpX0wqw+L 6MGmZnB5qsir6BgB749BvT/Wno2te72WvUEsuGnXGirjiGC42yGaSKdGqflR0KUTeHH5WU 0rALNgD/uVhiOkImOaodNaf0vAhV6fvkU6iIjito+o/vmqzLTQwLwGgM3H96jhPZLr/NDz OCQ4NkjieYDFdB2zZ/D2O2tT19FiuzY4PLKOlMYzotFEf82QIDVmNI/10IJb6Hy42ZrTyE B3YEAx6dAmpTGuycdRQRPtU9AmmaxuwrXv1RgzYt/a0+8Dzaf+M/tEQZcesLDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWNF66816zxCg for ; Thu, 04 Jun 2026 11:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22490 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 11:51:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7487932f4fbc - main - assert.h: style(9): Space after #define, between #endif and comment 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 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7487932f4fbc5a71231d3b1fc93d160253f38c83 Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 11:51:06 +0000 Message-Id: <6a2166aa.22490.59890f0d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7487932f4fbc5a71231d3b1fc93d160253f38c83 commit 7487932f4fbc5a71231d3b1fc93d160253f38c83 Author: Olivier Certner AuthorDate: 2026-06-02 10:01:05 +0000 Commit: Olivier Certner CommitDate: 2026-06-04 11:49:26 +0000 assert.h: style(9): Space after #define, between #endif and comment style(9) still allows TAB after #define but this is a historical artifact and by far the minority of uses cases. Going forward, we would like to promote the use of a single space, as it allows alignment to survive line prefixing (such as in diffs). style(9) also has prescribed a single space between '#else' or '#endif' and a comment recalling the guard since 2002. So, commit 157c184689ea ("assert.h: Remove leading tabs for whitespace consistency") was good, and in line with rules about whitespace changes (since the file was heavily modified by surrounding commits). This commit is thus basically a revert of 439710cf003b ("assert.h: Revert "Remove leading tabs for whitespace consistency"), which extended replacing spaces with TABs in the code introduced in the meantime (after commit 157c184689ea). Reviewed by: fuz, imp Fixes: 439710cf003b ("assert.h: Revert "Remove leading tabs for whitespace consistency") MAC after: 3 days Differential Revision: https://reviews.freebsd.org/D57391 --- include/assert.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/assert.h b/include/assert.h index f1dcf2bb180c..d4c9627bf3ea 100644 --- a/include/assert.h +++ b/include/assert.h @@ -46,11 +46,11 @@ #undef __assert_unreachable #ifdef NDEBUG -#define assert(e) ((void)0) -#define _assert(e) ((void)0) +#define assert(e) ((void)0) +#define _assert(e) ((void)0) #if __BSD_VISIBLE -#define __assert_unreachable() __unreachable() -#endif /* __BSD_VISIBLE */ +#define __assert_unreachable() __unreachable() +#endif /* __BSD_VISIBLE */ #else #ifdef __cplusplus #if __cplusplus < 202002L @@ -71,25 +71,25 @@ * of the remaining guarantees. * */ -#define __assert_sanitize(...) ((void)0) +#define __assert_sanitize(...) ((void)0) #else -#define __assert_sanitize(...) (void)sizeof(((bool(*)(bool))0)(__VA_ARGS__)) +#define __assert_sanitize(...) (void)sizeof(((bool(*)(bool))0)(__VA_ARGS__)) #endif /* __cplusplus < 202002L */ #else -#define __assert_sanitize(...) (void)sizeof(((_Bool(*)(_Bool))0)(__VA_ARGS__)) +#define __assert_sanitize(...) (void)sizeof(((_Bool(*)(_Bool))0)(__VA_ARGS__)) #endif /* __cplusplus */ -#define assert(...) (__assert_sanitize(__VA_ARGS__), \ +#define assert(...) (__assert_sanitize(__VA_ARGS__), \ (__VA_ARGS__) ? (void)0 : \ __assert(__func__, __FILE__, \ __LINE__, #__VA_ARGS__)) -#define _assert(...) assert(__VA_ARGS__) +#define _assert(...) assert(__VA_ARGS__) #if __BSD_VISIBLE -#define __assert_unreachable() assert(0 && "unreachable segment reached") -#endif /* __BSD_VISIBLE */ +#define __assert_unreachable() assert(0 && "unreachable segment reached") +#endif /* __BSD_VISIBLE */ #endif /* NDEBUG */ #ifndef __STDC_VERSION_ASSERT_H__ -#define __STDC_VERSION_ASSERT_H__ 202311L +#define __STDC_VERSION_ASSERT_H__ 202311L /* * Static assertions. In principle we could define static_assert for @@ -105,7 +105,7 @@ */ #if __ISO_C_VISIBLE >= 2011 && !defined(__cplusplus) && \ __STDC_VERSION__ < 202311L -#define static_assert _Static_assert +#define static_assert _Static_assert #endif __BEGIN_DECLS