Add and apply InsertBraces statement

> Insert braces after control statements (if, else, for, do, and while)
> in C++ unless the control statements are inside macro definitions or
> the braces would enclose preprocessor directives.

(cherry picked from commit d051e1e8f8eea1400191e0fd20641394b7d438be)

diff --git a/.clang-format b/.clang-format
index e2fc2068a90b6e3122a27e86bd9c2c243eddcd66..04c1f8b3a209fb41f9090605b58a92b34397ef1b 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -67,6 +67,7 @@ IncludeCategories:
   - Regex:           '.*'
     Priority:        0
 IndentExternBlock: NoIndent
+InsertBraces: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30

diff --git a/.clang-format.headers b/.clang-format.headers
index 8a4f06661d5e4dffde7b8af2004a29cad4f08294..ff9370413efcdca5394df4bee601706dfbb6068f 100644 (file)
--- a/.clang-format.headers
+++ b/.clang-format.headers
@@ -55,6 +55,7 @@ IncludeCategories:
   - Regex:           '".*"'
     Priority:        9
 IndentExternBlock: NoIndent
+InsertBraces: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30

diff --git a/lib/isc/picohttpparser.c b/lib/isc/picohttpparser.c
index ba1d291343a7255b302f1e682dc4bdec3892c021..0545624e547ede0381c428863cbcd323de747fdd 100644 (file)
--- a/lib/isc/picohttpparser.c
+++ b/lib/isc/picohttpparser.c
@@ -739,7 +739,9 @@ Exit:
                if (decoder->_total_overhead >= 100 * 1024 &&
                    decoder->_total_read - decoder->_total_overhead <
                            decoder->_total_read / 4)
+               {
                        ret = -1;
+               }
        }
        return ret;
 }