From nobody Thu Jun 4 11:51:06 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 4gWNFF4Cglz6gc8v for ; Thu, 04 Jun 2026 11:51:13 +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 4gWNFD0FRrz3PjS for ; Thu, 04 Jun 2026 11:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780573872; 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=t78fhK24TqMKlZRKXaFTIrYs/f7JqsyihEU49zixum7/y/IDAYIVkbXHczn61X81cFcd4r 1p8cP1tauLh5cCwhrCPcKmxGxu7zMLQQIiJ5TQGrkINFCxfUlWMfU2CFSDaWIo0iQPsGuf t4cREU5uv6ePesrxjO9mZ3ZErZaPXh5uE+kf5CQz/cZCq8HuD7i7/dzahxssy35LZzO2uT gTl0AQLiAEn0aXq3OMvwp3JocY8rlT2kdEH6+1D5S/xYRwvd+NwlqE/bun3k6KX0gluwwa FbXT4ECUYeK7qKMNi1J7rZJa2QmcAwSlRxp73NP4j2u07En+wsA17zviUuygXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780573872; a=rsa-sha256; cv=none; b=IFqLXDSYcEiUZtZFn2sm7NMxFj4w2bZkxd63wTHEOraESZglfkWk4qbI//Rf7dZATyYThz vT5acnNCX9vGxRXtHpsHaAduaGnTYNZEAPdRP9Kymjy2vCkp/Cp24fbBSVYJ3g+nZ91CcH 6PBGRnDYEYuGNB3rPRYeBhzUD10hsdj13ArnUSWD83gMJ7BFlUqCpDYG+Ub1clqg1h1Q/f KGLBV095P+VgWcArV8R/HKgqaX/cQUzim490IwDv6U3F6L35oFUePzDO4mPDxBCUrxL2dY bSaEZUV/+bIA7fCCXCtyIzBSRTekKtAp6FibTG1knduedrNUlPPv1jk8demsqA== 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=1780573872; 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=AsYlltfncoXlgafnlH2YUliQFSqe6U2E9VXjg5wzrrpZsZUGAOIL1wU8pgMKRNevfZFWg0 jAgchwKWfLlyuP2DpTiFFW0psdIDscHL1JiRWABUZPXVHtIbWqif2y54O7e6VsLDnPoiMh +48gdJ+XXmly53/DhxFxg1oEv4TB5VWl6eL04ZxFpTZdZvhMf25dP0ZmzIyu87ob3kDcCo HnMlniMDJnjvIzULJZ6KGFOk7a63Isz5jK7A0YUFfDBSFswW9v3JG+rIYtxXYMGLlpEGII HfQtWkFzfepGZU0jplh9NsILuklfnVy/kYCS7q1h8ltkPcHhPFvh+czEoznG/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWNFC6qfTzxdx for ; Thu, 04 Jun 2026 11:51:11 +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 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: 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