summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Ceresoli <luca.ceresoli@comelit.it>2011-05-14 05:50:00 +0000
committerWolfgang Denk <wd@denx.de>2011-05-19 21:36:02 +0200
commit7bc325a1b2dfda4a16789cc3b9387dbe1174af41 (patch)
tree49361362bfee59fbc7755fd60a69913cfdb59620
parent2cb53608076381e2cc4472790a0d768717d01b32 (diff)
downloadu-boot-imx-7bc325a1b2dfda4a16789cc3b9387dbe1174af41.zip
u-boot-imx-7bc325a1b2dfda4a16789cc3b9387dbe1174af41.tar.gz
u-boot-imx-7bc325a1b2dfda4a16789cc3b9387dbe1174af41.tar.bz2
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 <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de>
-rw-r--r--net/tftp.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/net/tftp.c b/net/tftp.c
index 81b7aa5..eacd529 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;