Date: Sun, 31 May 2026 19:51:30 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 439710cf003b - main - assert.h: Revert "Remove leading tabs for whitespace consistency" Message-ID: <6a1c9142.3037a.348e36a2@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=439710cf003b7849d2119e9a7694d7b27ab6d70f commit 439710cf003b7849d2119e9a7694d7b27ab6d70f Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-05-31 19:47:36 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-05-31 19:49:23 +0000 assert.h: Revert "Remove leading tabs for whitespace consistency" This reverts commit 157c184689ea3d7b8b6bd89aff849e94f004aa0e. As per style(9), a tab goes after #define. This should not have been removed. Reported by: kib Fixes: 157c184689ea3d7b8b6bd89aff849e94f004aa0e. Pull Request: https://github.com/freebsd/freebsd-src/pull/2203 --- include/assert.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/assert.h b/include/assert.h index 75d3e62e8932..f1dcf2bb180c 100644 --- a/include/assert.h +++ b/include/assert.h @@ -46,11 +46,11 @@ #undef __assert_unreachable #ifdef NDEBUG -#define assert(...) ((void)0) -#define _assert(...) ((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_DECLShome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1c9142.3037a.348e36a2>