oom: use CMP() macro

[thirdparty/systemd.git] / .clang-format

diff --git a/.clang-format b/.clang-format
index 2d412db269eb4fb984f7ed7c0015a4dadcf1f488..651249c701b4e63949034ed6aeabcb22faca3726 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -6,13 +6,13 @@
 # The easiest way to apply the formatting to your changes ONLY,
 # is to use the git-clang-format script (usually installed with clang-format).
 #
-# -  Fixup formatting before committing
+# -  Fix up formatting before committing
 # 1. Edit and stage your files.
 # 2. Run `git clang-format`.
 # 3. Verify + correct + (un)stage changes.
 # 4. Commit.
 #
-# -  Fixup formatting after committing
+# -  Fix up formatting after committing
 # 1. Commit your changes.
 # 2. Run `git clang-format HEAD~` - Refer the commit *before* your changes here.
 # 3. Verify + correct changes, `git difftool -d` can help here.
@@ -34,7 +34,7 @@ AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
-  AfterEnum:       true
+  AfterEnum:       false
   SplitEmptyFunction: false
   SplitEmptyRecord: false
   SplitEmptyNamespace: false
@@ -74,9 +74,6 @@ ForEachMacros:
   - FOREACH_INOTIFY_EVENT
   - FOREACH_STRING
   - FOREACH_SUBSYSTEM
-  - _FOREACH_WORD
-  - FOREACH_WORD
-  - FOREACH_WORD_SEPARATOR
   - HASHMAP_FOREACH
   - HASHMAP_FOREACH_IDX
   - HASHMAP_FOREACH_KEY
@@ -121,6 +118,7 @@ PenaltyBreakString: 0
 PenaltyExcessCharacter: 10
 PenaltyReturnTypeOnItsOwnLine: 100
 SpaceAfterCStyleCast: true
+SpaceBeforeParens: ControlStatementsExceptForEachMacros
 SpacesInAngles:  true
 TabWidth:        8
 UseCRLF:         false