]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
net/tftp.c: cosmetic: fix brace issues
authorLuca Ceresoli <luca.ceresoli@comelit.it>
Sat, 14 May 2011 05:50:00 +0000 (05:50 +0000)
committerWolfgang Denk <wd@denx.de>
Thu, 19 May 2011 19:36:02 +0000 (21:36 +0200)
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>
net/tftp.c

index 81b7aa59724d3eb841702b86bdf3190cd7f6fd43..eacd529a98e3941f7035cf18f55d11fcdfaaae38 100644 (file)
@@ -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;