diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /Documentation/CodingStyle | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'Documentation/CodingStyle')
| -rw-r--r-- | Documentation/CodingStyle | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 1cd3478e5834..58b0bf917834 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
| @@ -168,6 +168,13 @@ Do not unnecessarily use braces where a single statement will do. | |||
| 168 | if (condition) | 168 | if (condition) |
| 169 | action(); | 169 | action(); |
| 170 | 170 | ||
| 171 | and | ||
| 172 | |||
| 173 | if (condition) | ||
| 174 | do_this(); | ||
| 175 | else | ||
| 176 | do_that(); | ||
| 177 | |||
| 171 | This does not apply if one branch of a conditional statement is a single | 178 | This does not apply if one branch of a conditional statement is a single |
| 172 | statement. Use braces in both branches. | 179 | statement. Use braces in both branches. |
| 173 | 180 | ||