Commit 0e6d3c8c73 for openssl.org
commit 0e6d3c8c739601c2bd869c328c234df4152365cf
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Thu Aug 13 16:58:22 2026 +0200
.clang-format: add OSSL_LIST, {PRIORITY_QUEUE,SPARSE_ARRAY}_OF to TypenameMacros
These were omitted in 232b32804613 "Add a WebKit clang-format file"
for some reason, and clang-format is apparently unable to figure out
that a macro resolves in a type name, in all its geniousness, leading
to incorrect and misleading formating of the code that uses these type
macros. Rescind that omission.
Fixes: 232b32804613 "Add a WebKit clang-format file"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Milan Broz <mbroz@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Merge-date: Thu Sep 24 09:01:04 2026
Merged-from: https://github.com/openssl/openssl/pull/32304
diff --git a/.clang-format b/.clang-format
index 13d0417588..96f375529c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1134,7 +1134,14 @@ TypeNames:
- "HASH_LONG"
- "MD32_REG_T"
# OpenSSL uses macros extensively. Tell clang-format about them.
-TypenameMacros: ['LHASH_OF', "OSSL_RBT_ENTRY", "OSSL_RBT_HEAD", 'STACK_OF']
+TypenameMacros:
+ - "LHASH_OF"
+ - "OSSL_LIST"
+ - "OSSL_RBT_ENTRY"
+ - "OSSL_RBT_HEAD"
+ - "PRIORITY_QUEUE_OF"
+ - "SPARSE_ARRAY_OF"
+ - "STACK_OF"
StatementMacros:
- "BLOCK_CIPHER_aead"
- "BLOCK_CIPHER_generic"