Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 9aef87286bbfac356c3d09dc80d96da015064295 Author: Markus Pargmann mpa@pengutronix.de Date: Fri Dec 26 12:41:23 2014 +0100

batman-adv: tvlv realloc, move error handling into if block

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 Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

9aef87286bbfac356c3d09dc80d96da015064295 main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/main.c b/main.c index 12fc77b..a36cd71 100644 --- a/main.c +++ b/main.c @@ -819,15 +819,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; }

/**