From: Luca Ceresoli Date: Sat, 14 May 2011 05:50:00 +0000 (+0000) Subject: net/tftp.c: cosmetic: fix brace issues X-Git-Tag: v2011.06-rc1~10 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7bc325a1b2dfda4a16789cc3b9387dbe1174af41;p=oweals%2Fu-boot.git net/tftp.c: cosmetic: fix brace issues This removes the following checkpatch issues: - WARNING: braces {} are not necessary for single statement blocks - WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Luca Ceresoli Cc: Wolfgang Denk --- diff --git a/net/tftp.c b/net/tftp.c index 81b7aa5972..eacd529a98 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -307,13 +307,11 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, #endif return; } - if (TftpState != STATE_RRQ && src != TftpServerPort) { + if (TftpState != STATE_RRQ && src != TftpServerPort) return; - } - if (len < 2) { + if (len < 2) return; - } len -= 2; /* warning: don't use increment (++) in ntohs() macros!! */ s = (ushort *)pkt; @@ -393,11 +391,10 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, } #endif else { - if (((TftpBlock - 1) % 10) == 0) { + if (((TftpBlock - 1) % 10) == 0) putc('#'); - } else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) { + else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) puts("\n\t "); - } } if (TftpState == STATE_RRQ) @@ -638,13 +635,11 @@ TftpStart(void) #ifdef CONFIG_TFTP_PORT ep = getenv("tftpdstp"); - if (ep != NULL) { + if (ep != NULL) TftpServerPort = simple_strtol(ep, NULL, 10); - } ep = getenv("tftpsrcp"); - if (ep != NULL) { + if (ep != NULL) TftpOurPort = simple_strtol(ep, NULL, 10); - } #endif TftpBlock = 0;