minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

net/tftp.c: cosmetic: do not use assignment in if condition

Browse Source 
This removes the following checkpatch issue:
 - ERROR: do not use assignment in if condition.

There is one such error left:

  ERROR: do not use assignment in if condition
  #239: FILE: tftp.c:239:
  +		if (!ProhibitMcast
  +		 && (Bitmap = malloc(Mapsize))
  +		 && eth_get_dev()->mcast) {

which would require an additional nested if to be fixed, resulting in longer
and less readable code.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Luca Ceresoli 2011-05-14 05:49:59 +00:00 committed by Wolfgang Denk
parent 2e320257c8
commit 2cb5360807
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/tftp.c
View File

@ -552,10 +552,12 @@ TftpStart(void)
* Allow the user to choose TFTP blocksize and timeout. * Allow the user to choose TFTP blocksize and timeout.
* TFTP protocol has a minimal timeout of 1 second. * TFTP protocol has a minimal timeout of 1 second.
*/ */
if ((ep = getenv("tftpblocksize")) != NULL) ep = getenv("tftpblocksize");
if (ep != NULL)
TftpBlkSizeOption = simple_strtol(ep, NULL, 10); TftpBlkSizeOption = simple_strtol(ep, NULL, 10);
if ((ep = getenv("tftptimeout")) != NULL) ep = getenv("tftptimeout");
if (ep != NULL)
TftpTimeoutMSecs = simple_strtol(ep, NULL, 10); TftpTimeoutMSecs = simple_strtol(ep, NULL, 10);
if (TftpTimeoutMSecs < 1000) { if (TftpTimeoutMSecs < 1000) {
@ -635,10 +637,12 @@ TftpStart(void)
TftpOurPort = 1024 + (get_timer(0) % 3072); TftpOurPort = 1024 + (get_timer(0) % 3072);
#ifdef CONFIG_TFTP_PORT #ifdef CONFIG_TFTP_PORT
if ((ep = getenv("tftpdstp")) != NULL) { ep = getenv("tftpdstp");
if (ep != NULL) {
TftpServerPort = simple_strtol(ep, NULL, 10); TftpServerPort = simple_strtol(ep, NULL, 10);
} }
if ((ep = getenv("tftpsrcp")) != NULL) { ep = getenv("tftpsrcp");
if (ep != NULL) {
TftpOurPort = simple_strtol(ep, NULL, 10); TftpOurPort = simple_strtol(ep, NULL, 10);
} }
#endif #endif
@ -721,7 +725,8 @@ static void parse_multicast_oack(char *pkt, int len)
/* I malloc instead of pre-declare; so that if the file ends /* I malloc instead of pre-declare; so that if the file ends
* up being too big for this bitmap I can retry * up being too big for this bitmap I can retry
*/ */
if (!(Bitmap = malloc(Mapsize))) { Bitmap = malloc(Mapsize);
if (!Bitmap) {
printf("No Bitmap, no multicast. Sorry.\n"); printf("No Bitmap, no multicast. Sorry.\n");
ProhibitMcast = 1; ProhibitMcast = 1;
return; return;
@ -734,7 +739,8 @@ static void parse_multicast_oack(char *pkt, int len)
if (Mcast_addr != addr) { if (Mcast_addr != addr) {
if (Mcast_addr) if (Mcast_addr)
eth_mcast_join(Mcast_addr, 0); eth_mcast_join(Mcast_addr, 0);
if (eth_mcast_join(Mcast_addr = addr, 1)) { Mcast_addr = addr;
if (eth_mcast_join(Mcast_addr, 1)) {
printf("Fail to set mcast, revert to TFTP\n"); printf("Fail to set mcast, revert to TFTP\n");
ProhibitMcast = 1; ProhibitMcast = 1;
mcast_cleanup(); mcast_cleanup();