diff mbox

[v2,06/26] batman-adv: tvlv realloc, move error handling into if block

Message ID 1419594103-10928-7-git-send-email-mpa@pengutronix.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Markus Pargmann Dec. 26, 2014, 11:41 a.m. UTC 
  Instead of hiding the normal function flow inside an if block, we should
just put the error handling into the if block.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 main.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Marek Lindner Jan. 11, 2015, 12:40 p.m. UTC | #1 
On Friday 26 December 2014 12:41:23 Markus Pargmann wrote:
> Instead of hiding the normal function flow inside an if block, we should
> just put the error handling into the if block.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
>  main.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)

Applied in revision 9aef872.

Thanks,
Marek
diff mbox

Patch

diff --git a/main.c b/main.c
index 65021ea567e8..00a1107109e8 100644
--- a/main.c
+++ b/main.c
@@ -838,15 +838,15 @@  static bool batadv_tvlv_realloc_packet_buff(unsigned char **packet_buff,
 	new_buff = kmalloc(min_packet_len + additional_packet_len, GFP_ATOMIC);
 
 	/* keep old buffer if kmalloc should fail */
-	if (new_buff) {
-		memcpy(new_buff, *packet_buff, min_packet_len);
-		kfree(*packet_buff);
-		*packet_buff = new_buff;
-		*packet_buff_len = min_packet_len + additional_packet_len;
-		return true;
-	}
+	if (!new_buff)
+		return false;
+
+	memcpy(new_buff, *packet_buff, min_packet_len);
+	kfree(*packet_buff);
+	*packet_buff = new_buff;
+	*packet_buff_len = min_packet_len + additional_packet_len;
 
-	return false;
+	return true;
 }
 
 /**