diff options
| author | Steffan Karger | 2017-01-14 15:10:20 +0100 |
|---|---|---|
| committer | David Sommerseth | 2017-01-18 20:55:15 +0100 |
| commit | 9c2506d4395de67dbc520b6458f25e99b99376eb (patch) | |
| tree | 65aed0fc7ffb1ec7a8932ad0a00dbaaa9bf2d2a0 /src/openvpn/error.h | |
| parent | 977f0b9ff4b600212b603279153ff1b1b10cf527 (diff) | |
| download | openvpn-9c2506d4395de67dbc520b6458f25e99b99376eb.zip openvpn-9c2506d4395de67dbc520b6458f25e99b99376eb.tar.gz | |
More broadly enforce Allman style and braces-around-conditionals
We want { and } aligned, which means also adding a newline between each
for() and {, while() and {, etc.
Also, we agreed to always use braces with conditionals. The previous
uncrustify config added these for if()s, now also add these for while()
and for().
Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1484403020-6857-1-git-send-email-steffan@karger.me>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13875.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
(cherry picked from commit 4cd4899e8e80efae03c584a760fd107251735723)
Diffstat (limited to 'src/openvpn/error.h')
| -rw-r--r-- | src/openvpn/error.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/openvpn/error.h b/src/openvpn/error.h index df4eee7..c86b956 100644 --- a/src/openvpn/error.h +++ b/src/openvpn/error.h @@ -394,7 +394,8 @@ ignore_sys_error(const int err) /** Convert fatal errors to nonfatal, don't touch other errors */ static inline unsigned int -nonfatal(const unsigned int err) { +nonfatal(const unsigned int err) +{ return err & M_FATAL ? (err ^ M_FATAL) | M_NONFATAL : err; } |