[B.A.T.M.A.N.] [PATCH] batman-adv: make the use of braces in if-else consistent

[B.A.T.M.A.N.] [PATCH] batman-adv: make the use of braces in if-else consistent

[Martin Hundebøll]

To avoid confusion, the linux kernel coding style discourage the use
of one if-else branch with braces and another without braces.

Introduced-by: 65d8217193427026169c48112c561c5ca4d1bd18 ("batman-adv:
compat: fix null pointer exception for kernels < 3.9")

Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
---
 compat.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compat.h b/compat.h
index 7beba36..0ceb2b1 100644
--- a/compat.h
+++ b/compat.h
@@ -167,8 +167,9 @@ static inline int batadv_param_set_copystring(const char *val,
 		rcu_read_unlock(); \
 		dev_hold(dev); \
 		return dev; \
-	} else \
-		dev = NULL;
+	} else {\
+		dev = NULL; \
+	}
 
 #endif /* < KERNEL_VERSION(2, 6, 36) */
 
-- 
1.9.0

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: make the use of braces in if-else consistent

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

On Tuesday 18 February 2014 12:03:55 Martin Hundebøll wrote:
> To avoid confusion, the linux kernel coding style discourage the use
> of one if-else branch with braces and another without braces.
> 
> Introduced-by: 65d8217193427026169c48112c561c5ca4d1bd18 ("batman-adv:
> compat: fix null pointer exception for kernels < 3.9")
> 
> Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
> ---
>  compat.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Applied in revision 534aa4a.

Thanks,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 490 bytes --]