The branch, master has been updated via f83d6c53cce clang-format: sort alphabetically via 071b1024960 clang-format: tweak config to bring us closer to README.Coding. from 6830b796ac8 s3:/winbindd: remove parse_domain_user_fstr
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f83d6c53cce2805f47ead0f2944fce294481e0d6 Author: Ralph Boehme <s...@samba.org> Date: Fri Jun 30 17:05:46 2023 +0200 clang-format: sort alphabetically Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Tue Oct 24 14:47:57 UTC 2023 on atb-devel-224 commit 071b102496078d64d6c31fa3da37edc722ef7407 Author: Ralph Boehme <s...@samba.org> Date: Fri Jun 30 13:00:23 2023 +0200 clang-format: tweak config to bring us closer to README.Coding. I'm enabling "AllowAllArgumentsOnNextLine" because that's longstanding practice with many many function calls like tevent_req_callback_data() and tevent_req_data() and imho results in the most readable code at the place where this is often seen (variable declartions with tevent_req_* stuff). Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: .clang-format | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/.clang-format b/.clang-format index 5385807bc1c..c4c12b9955b 100644 --- a/.clang-format +++ b/.clang-format @@ -1,9 +1,14 @@ # https://clang.llvm.org/docs/ClangFormatStyleOptions.html +AlignAfterOpenBracket: Align +AlignEscapedNewlines: Left +AllowAllArgumentsOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortFunctionsOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: false +AlwaysBreakAfterReturnType: None BasedOnStyle: LLVM -IndentWidth: 8 -ContinuationIndentWidth: 8 -UseTab: true -BreakBeforeBraces: Custom +BinPackArguments: false +BinPackParameters: false BraceWrapping: AfterEnum: false AfterFunction: true @@ -12,15 +17,17 @@ BraceWrapping: AfterExternBlock: true BeforeElse: false BeforeWhile: false -AllowShortIfStatementsOnASingleLine: false + AfterControlStatement: MultiLine +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom ColumnLimit: 80 +ContinuationIndentWidth: 8 IndentCaseLabels: false -AlignAfterOpenBracket: Align -BinPackParameters: false -BinPackArguments: false -AllowAllParametersOfDeclarationOnNextLine: false -AllowAllArgumentsOnNextLine: false -AllowShortFunctionsOnASingleLine: Empty -AlwaysBreakAfterReturnType: None -AlignEscapedNewlines: Left +IndentGotoLabels: false +IndentWidth: 8 +PenaltyBreakAssignment: 200 +PenaltyBreakBeforeFirstCallParameter: 100 +PenaltyReturnTypeOnItsOwnLine: 1000 SortIncludes: false +UseTab: true +WhitespaceSensitiveMacros: ['DEBUG'] -- Samba Shared Repository