diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-02-01 00:14:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-01 00:14:57 +0300 |
commit | a92aae5b18793a4a7073a0e5a8e17ed36965a672 (patch) | |
tree | 860c10499cb074365daf31a1d05c1c53ebf7ba35 | |
parent | 42ace93e41da0abe5a264fb8661f1c7de88206ec (diff) | |
parent | 1797dc51766576453c64fd422e25741ead9b2687 (diff) |
Merge branch 'jk/coding-guidelines-update'
Developer doc update.
* jk/coding-guidelines-update:
CodingGuidelines: clarify multi-line brace style
-rw-r--r-- | Documentation/CodingGuidelines | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 4cd95da6b1..a4191aa388 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -206,11 +206,38 @@ For C programs: x = 1; } - is frowned upon. A gray area is when the statement extends - over a few lines, and/or you have a lengthy comment atop of - it. Also, like in the Linux kernel, if there is a long list - of "else if" statements, it can make sense to add braces to - single line blocks. + is frowned upon. But there are a few exceptions: + + - When the statement extends over a few lines (e.g., a while loop + with an embedded conditional, or a comment). E.g.: + + while (foo) { + if (x) + one(); + else + two(); + } + + if (foo) { + /* + * This one requires some explanation, + * so we're better off with braces to make + * it obvious that the indentation is correct. + */ + doit(); + } + + - When there are multiple arms to a conditional and some of them + require braces, enclose even a single line block in braces for + consistency. E.g.: + + if (foo) { + doit(); + } else { + one(); + two(); + three(); + } - We try to avoid assignments in the condition of an "if" statement. |