Patchwork [U-Boot,6/8] net/tftp.c: cosmetic: trailing statements should be on next line

login
register
mail settings
Submitter Luca Ceresoli
Date May 14, 2011, 3:50 p.m.
Message ID <1305388203-22983-7-git-send-email-luca.ceresoli@comelit.it>
Download mbox | patch
Permalink /patch/95564/
State Accepted
Commit 6d2231e8fa21f4bc4fcff3690146540f30984d61
Headers show

Comments

Luca Ceresoli - May 14, 2011, 3:50 p.m.
This removes the following checkpatch issue:
 - ERROR: trailing statements should be on next line

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
---
 net/tftp.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
Wolfgang Denk - May 19, 2011, 7:37 p.m.
Dear Luca Ceresoli,

In message <1305388203-22983-7-git-send-email-luca.ceresoli@comelit.it> you wrote:
> This removes the following checkpatch issue:
>  - ERROR: trailing statements should be on next line
> 
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
>  net/tftp.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/net/tftp.c b/net/tftp.c
index eacd529..f83c0d6 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -136,8 +136,10 @@  static void parse_multicast_oack(char *pkt, int len);
 static void
 mcast_cleanup(void)
 {
-	if (Mcast_addr) eth_mcast_join(Mcast_addr, 0);
-	if (Bitmap) free(Bitmap);
+	if (Mcast_addr)
+		eth_mcast_join(Mcast_addr, 0);
+	if (Bitmap)
+		free(Bitmap);
 	Bitmap = NULL;
 	Mcast_addr = Multicast = Mcast_port = 0;
 	TftpEndingBlock = -1;
@@ -703,7 +705,8 @@  static void parse_multicast_oack(char *pkt, int len)
 			}
 		}
 	}
-	if (!port || !mc_adr || !mc) return;
+	if (!port || !mc_adr || !mc)
+		return;
 	if (Multicast && MasterClient) {
 		printf("I got a OACK as master Client, WRONG!\n");
 		return;