* [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance
@ 2011-05-14 15:49 Luca Ceresoli
2011-05-14 15:49 ` [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters Luca Ceresoli
` (7 more replies)
0 siblings, 8 replies; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:49 UTC (permalink / raw)
To: u-boot
Hi,
net/tftp.c currently raises 82 errors and 99 warnings.
This patchset fixes most of them, leaving 3 errors and 14 warnings.
Since the changes are quite massive I split them in separate patches, one
per each category of errors/warning.
These issues are still present:
- ERROR: else should follow close brace '}'
these are due to the presence of an #ifdef right after or before the else
(to compile an entire branch conditionally), and cannot be removed easily
without compromising readability;
- WARNING: consider using kstrto* in preference to simple_*
which are Linux-specific;
- WARNING: externs should be avoided in .c files
these are due to loop-dependencies with other files;
- WARNING: Use of volatile is usually wrong [...]
I've had a quick look at these, but I don't know in detail how the
networking code and Ethernet drivers (and maybe DMA?) interact, so I cannot
remove them being sure that things will continue working;
- WARNING: plain inline is preferred over __inline__
as I see many "__inline__"s in the current source and don't know what the
U-Boot policy is.
Luca Ceresoli (8):
net/tftp.c: cosmetic: fix lines over 80 characters
net/tftp.c: cosmetic: fix whitespace issues
net/tftp.c: cosmetic: fix pointer syntax issues
net/tftp.c: cosmetic: do not use assignment in if condition
net/tftp.c: cosmetic: fix brace issues
net/tftp.c: cosmetic: trailing statements should be on next line
net/tftp.c: cosmetic: fix indentation
net/tftp.c: cosmetic: do not initialise statics to 0 or NULL
net/tftp.c | 309 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 167 insertions(+), 142 deletions(-)
Luca
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
@ 2011-05-14 15:49 ` Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:49 ` [U-Boot] [PATCH 2/8] net/tftp.c: cosmetic: fix whitespace issues Luca Ceresoli
` (6 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:49 UTC (permalink / raw)
To: u-boot
Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
---
net/tftp.c | 66 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index 00abec3..2eace3d 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -1,7 +1,7 @@
/*
- * Copyright 1994, 1995, 2000 Neil Russell.
- * (See License)
- * Copyright 2000, 2001 DENX Software Engineering, Wolfgang Denk, wd at denx.de
+ * Copyright 1994, 1995, 2000 Neil Russell.
+ * (See License)
+ * Copyright 2000, 2001 DENX Software Engineering, Wolfgang Denk, wd at denx.de
*/
#include <common.h>
@@ -10,15 +10,18 @@
#include "tftp.h"
#include "bootp.h"
-#define WELL_KNOWN_PORT 69 /* Well known TFTP port # */
-#define TIMEOUT 5000UL /* Millisecs to timeout for lost pkt */
+/* Well known TFTP port # */
+#define WELL_KNOWN_PORT 69
+/* Millisecs to timeout for lost pkt */
+#define TIMEOUT 5000UL
#ifndef CONFIG_NET_RETRY_COUNT
-# define TIMEOUT_COUNT 10 /* # of timeouts before giving up */
+/* # of timeouts before giving up */
+# define TIMEOUT_COUNT 10
#else
# define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT * 2)
#endif
- /* (for checking the image size) */
-#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
+/* Number of "loading" hashes per line (for checking the image size) */
+#define HASHES_PER_LINE 65
/*
* TFTP operations.
@@ -56,17 +59,25 @@ enum {
};
static IPaddr_t TftpServerIP;
-static int TftpServerPort; /* The UDP port at their end */
-static int TftpOurPort; /* The UDP port at our end */
+/* The UDP port at their end */
+static int TftpServerPort;
+/* The UDP port at our end */
+static int TftpOurPort;
static int TftpTimeoutCount;
-static ulong TftpBlock; /* packet sequence number */
-static ulong TftpLastBlock; /* last packet sequence number received */
-static ulong TftpBlockWrap; /* count of sequence number wraparounds */
-static ulong TftpBlockWrapOffset; /* memory offset due to wrapping */
+/* packet sequence number */
+static ulong TftpBlock;
+/* last packet sequence number received */
+static ulong TftpLastBlock;
+/* count of sequence number wraparounds */
+static ulong TftpBlockWrap;
+/* memory offset due to wrapping */
+static ulong TftpBlockWrapOffset;
static int TftpState;
#ifdef CONFIG_TFTP_TSIZE
-static int TftpTsize; /* The file size reported by the server */
-static short TftpNumchars; /* The number of hashes we printed */
+/* The file size reported by the server */
+static int TftpTsize;
+/* The number of hashes we printed */
+static short TftpNumchars;
#endif
#define STATE_RRQ 1
@@ -75,8 +86,10 @@ static short TftpNumchars; /* The number of hashes we printed */
#define STATE_BAD_MAGIC 4
#define STATE_OACK 5
-#define TFTP_BLOCK_SIZE 512 /* default TFTP block size */
-#define TFTP_SEQUENCE_SIZE ((ulong)(1<<16)) /* sequence number is 16 bit */
+/* default TFTP block size */
+#define TFTP_BLOCK_SIZE 512
+/* sequence number is 16 bit */
+#define TFTP_SEQUENCE_SIZE ((ulong)(1<<16))
#define DEFAULT_NAME_LEN (8 + 4 + 1)
static char default_filename[DEFAULT_NAME_LEN];
@@ -273,7 +286,8 @@ TftpSend (void)
break;
}
- NetSendUDPPacket(NetServerEther, TftpServerIP, TftpServerPort, TftpOurPort, len);
+ NetSendUDPPacket(NetServerEther, TftpServerIP, TftpServerPort,
+ TftpOurPort, len);
}
@@ -333,7 +347,8 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
}
#ifdef CONFIG_TFTP_TSIZE
if (strcmp ((char*)pkt+i,"tsize") == 0) {
- TftpTsize = simple_strtoul((char*)pkt+i+6,NULL,10);
+ TftpTsize = simple_strtoul((char*)pkt+i+6,
+ NULL, 10);
debug("size = %s, %d\n",
(char*)pkt+i+6, TftpTsize);
}
@@ -361,12 +376,15 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
*/
if (TftpBlock == 0) {
TftpBlockWrap++;
- TftpBlockWrapOffset += TftpBlkSize * TFTP_SEQUENCE_SIZE;
- printf ("\n\t %lu MB received\n\t ", TftpBlockWrapOffset>>20);
+ TftpBlockWrapOffset +=
+ TftpBlkSize * TFTP_SEQUENCE_SIZE;
+ printf ("\n\t %lu MB received\n\t ",
+ TftpBlockWrapOffset>>20);
}
#ifdef CONFIG_TFTP_TSIZE
else if (TftpTsize) {
- while (TftpNumchars < NetBootFileXferSize * 50 / TftpTsize) {
+ while (TftpNumchars <
+ NetBootFileXferSize * 50 / TftpTsize) {
putc('#');
TftpNumchars++;
}
@@ -466,7 +484,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
* run it.
*/
#ifdef CONFIG_TFTP_TSIZE
- /* Print out the hash marks for the last packet received */
+ /* Print hash marks for the last packet received */
while (TftpTsize && TftpNumchars < 49) {
putc('#');
TftpNumchars++;
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 2/8] net/tftp.c: cosmetic: fix whitespace issues
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
2011-05-14 15:49 ` [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters Luca Ceresoli
@ 2011-05-14 15:49 ` Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:49 ` [U-Boot] [PATCH 3/8] net/tftp.c: cosmetic: fix pointer syntax issues Luca Ceresoli
` (5 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:49 UTC (permalink / raw)
To: u-boot
This removes the following checkpatch issues:
- ERROR: space prohibited before that close parenthesis ')'
- ERROR: space required after that ';' (ctx:BxV)
- ERROR: space required after that ',' (ctx:VxV)
- ERROR: space required after that ';' (ctx:VxV)
- ERROR: spaces required around that '<<=' (ctx:VxV)
- ERROR: spaces required around that '<' (ctx:VxV)
- ERROR: spaces required around that '=' (ctx:VxV)
- ERROR: spaces required around that '+=' (ctx:VxV)
- ERROR: spaces required around that '=' (ctx:VxW)
- WARNING: please, no spaces at the start of a line
- WARNING: space prohibited between function name and open parenthesis '('
Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
---
net/tftp.c | 192 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 97 insertions(+), 95 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index 2eace3d..c0342a8 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -117,28 +117,28 @@ extern flash_info_t flash_info[];
#define TFTP_MTU_BLOCKSIZE 1468
#endif
-static unsigned short TftpBlkSize=TFTP_BLOCK_SIZE;
-static unsigned short TftpBlkSizeOption=TFTP_MTU_BLOCKSIZE;
+static unsigned short TftpBlkSize = TFTP_BLOCK_SIZE;
+static unsigned short TftpBlkSizeOption = TFTP_MTU_BLOCKSIZE;
#ifdef CONFIG_MCAST_TFTP
#include <malloc.h>
#define MTFTP_BITMAPSIZE 0x1000
static unsigned *Bitmap;
-static int PrevBitmapHole,Mapsize=MTFTP_BITMAPSIZE;
-static uchar ProhibitMcast=0, MasterClient=0;
-static uchar Multicast=0;
+static int PrevBitmapHole, Mapsize = MTFTP_BITMAPSIZE;
+static uchar ProhibitMcast = 0, MasterClient = 0;
+static uchar Multicast = 0;
extern IPaddr_t Mcast_addr;
static int Mcast_port;
static ulong TftpEndingBlock; /* can get 'last' block before done..*/
-static void parse_multicast_oack(char *pkt,int len);
+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);
- Bitmap=NULL;
+ Bitmap = NULL;
Mcast_addr = Multicast = Mcast_port = 0;
TftpEndingBlock = -1;
}
@@ -146,14 +146,14 @@ mcast_cleanup(void)
#endif /* CONFIG_MCAST_TFTP */
static __inline__ void
-store_block (unsigned block, uchar * src, unsigned len)
+store_block(unsigned block, uchar * src, unsigned len)
{
ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
ulong newsize = offset + len;
#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
int i, rc = 0;
- for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; i++) {
+ for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
/* start address in flash? */
if (flash_info[i].flash_id == FLASH_UNKNOWN)
continue;
@@ -164,9 +164,9 @@ store_block (unsigned block, uchar * src, unsigned len)
}
if (rc) { /* Flash is destination for this packet */
- rc = flash_write ((char *)src, (ulong)(load_addr+offset), len);
+ rc = flash_write((char *)src, (ulong)(load_addr+offset), len);
if (rc) {
- flash_perror (rc);
+ flash_perror(rc);
NetState = NETLOOP_FAIL;
return;
}
@@ -185,13 +185,13 @@ store_block (unsigned block, uchar * src, unsigned len)
NetBootFileXferSize = newsize;
}
-static void TftpSend (void);
-static void TftpTimeout (void);
+static void TftpSend(void);
+static void TftpTimeout(void);
/**********************************************************************/
static void
-TftpSend (void)
+TftpSend(void)
{
volatile uchar * pkt;
volatile uchar * xp;
@@ -218,11 +218,11 @@ TftpSend (void)
s = (ushort *)pkt;
*s++ = htons(TFTP_RRQ);
pkt = (uchar *)s;
- strcpy ((char *)pkt, tftp_filename);
+ strcpy((char *)pkt, tftp_filename);
pkt += strlen(tftp_filename) + 1;
- strcpy ((char *)pkt, "octet");
+ strcpy((char *)pkt, "octet");
pkt += 5 /*strlen("octet")*/ + 1;
- strcpy ((char *)pkt, "timeout");
+ strcpy((char *)pkt, "timeout");
pkt += 7 /*strlen("timeout")*/ + 1;
sprintf((char *)pkt, "%lu", TftpTimeoutMSecs / 1000);
debug("send option \"timeout %s\"\n", (char *)pkt);
@@ -232,16 +232,16 @@ TftpSend (void)
pkt += 8;
#endif
/* try for more effic. blk size */
- pkt += sprintf((char *)pkt,"blksize%c%d%c",
- 0,TftpBlkSizeOption,0);
+ pkt += sprintf((char *)pkt, "blksize%c%d%c",
+ 0, TftpBlkSizeOption, 0);
#ifdef CONFIG_MCAST_TFTP
/* Check all preconditions before even trying the option */
if (!ProhibitMcast
- && (Bitmap=malloc(Mapsize))
+ && (Bitmap = malloc(Mapsize))
&& eth_get_dev()->mcast) {
free(Bitmap);
- Bitmap=NULL;
- pkt += sprintf((char *)pkt,"multicast%c%c",0,0);
+ Bitmap = NULL;
+ pkt += sprintf((char *)pkt, "multicast%c%c", 0, 0);
}
#endif /* CONFIG_MCAST_TFTP */
len = pkt - xp;
@@ -251,7 +251,8 @@ TftpSend (void)
#ifdef CONFIG_MCAST_TFTP
/* My turn! Start at where I need blocks I missed.*/
if (Multicast)
- TftpBlock=ext2_find_next_zero_bit(Bitmap,(Mapsize*8),0);
+ TftpBlock = ext2_find_next_zero_bit(Bitmap,
+ (Mapsize*8), 0);
/*..falling..*/
#endif
case STATE_DATA:
@@ -269,7 +270,7 @@ TftpSend (void)
*s++ = htons(TFTP_ERROR);
*s++ = htons(3);
pkt = (uchar *)s;
- strcpy ((char *)pkt, "File too large");
+ strcpy((char *)pkt, "File too large");
pkt += 14 /*strlen("File too large")*/ + 1;
len = pkt - xp;
break;
@@ -280,7 +281,7 @@ TftpSend (void)
*s++ = htons(TFTP_ERROR);
*s++ = htons(2);
pkt = (uchar *)s;
- strcpy ((char *)pkt, "File has bad magic");
+ strcpy((char *)pkt, "File has bad magic");
pkt += 18 /*strlen("File has bad magic")*/ + 1;
len = pkt - xp;
break;
@@ -338,15 +339,16 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
* Careful: "i" is signed, "len" is unsigned, thus
* something like "len-8" may give a *huge* number
*/
- for (i=0; i+8<len; i++) {
- if (strcmp ((char*)pkt+i,"blksize") == 0) {
+ for (i = 0; i+8 < len; i++) {
+ if (strcmp((char*)pkt+i, "blksize") == 0) {
TftpBlkSize = (unsigned short)
- simple_strtoul((char*)pkt+i+8,NULL,10);
+ simple_strtoul((char*)pkt+i+8, NULL,
+ 10);
debug("Blocksize ack: %s, %d\n",
- (char*)pkt+i+8,TftpBlkSize);
+ (char*)pkt+i+8, TftpBlkSize);
}
#ifdef CONFIG_TFTP_TSIZE
- if (strcmp ((char*)pkt+i,"tsize") == 0) {
+ if (strcmp((char*)pkt+i, "tsize") == 0) {
TftpTsize = simple_strtoul((char*)pkt+i+6,
NULL, 10);
debug("size = %s, %d\n",
@@ -355,12 +357,12 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
#endif
}
#ifdef CONFIG_MCAST_TFTP
- parse_multicast_oack((char *)pkt,len-1);
+ parse_multicast_oack((char *)pkt, len-1);
if ((Multicast) && (!MasterClient))
TftpState = STATE_DATA; /* passive.. */
else
#endif
- TftpSend (); /* Send ACK */
+ TftpSend(); /* Send ACK */
break;
case TFTP_DATA:
if (len < 2)
@@ -378,7 +380,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
TftpBlockWrap++;
TftpBlockWrapOffset +=
TftpBlkSize * TFTP_SEQUENCE_SIZE;
- printf ("\n\t %lu MB received\n\t ",
+ printf("\n\t %lu MB received\n\t ",
TftpBlockWrapOffset>>20);
}
#ifdef CONFIG_TFTP_TSIZE
@@ -392,9 +394,9 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
#endif
else {
if (((TftpBlock - 1) % 10) == 0) {
- putc ('#');
+ putc('#');
} else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) {
- puts ("\n\t ");
+ puts("\n\t ");
}
}
@@ -415,11 +417,11 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
} else
#endif
if (TftpBlock != 1) { /* Assertion */
- printf ("\nTFTP error: "
- "First block is not block 1 (%ld)\n"
- "Starting again\n\n",
+ printf("\nTFTP error: "
+ "First block is not block 1 (%ld)\n"
+ "Starting again\n\n",
TftpBlock);
- NetStartAgain ();
+ NetStartAgain();
break;
}
}
@@ -433,9 +435,9 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
TftpLastBlock = TftpBlock;
TftpTimeoutCountMax = TIMEOUT_COUNT;
- NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
+ NetSetTimeout(TftpTimeoutMSecs, TftpTimeout);
- store_block (TftpBlock - 1, pkt + 2, len);
+ store_block(TftpBlock - 1, pkt + 2, len);
/*
* Acknoledge the block just received, which will prompt
@@ -455,23 +457,23 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
(Mapsize*8),
PrevBitmapHole);
if (TftpBlock > ((Mapsize*8) - 1)) {
- printf ("tftpfile too big\n");
+ printf("tftpfile too big\n");
/* try to double it and retry */
- Mapsize<<=1;
+ Mapsize <<= 1;
mcast_cleanup();
- NetStartAgain ();
+ NetStartAgain();
return;
}
TftpLastBlock = TftpBlock;
}
}
#endif
- TftpSend ();
+ TftpSend();
#ifdef CONFIG_MCAST_TFTP
if (Multicast) {
if (MasterClient && (TftpBlock >= TftpEndingBlock)) {
- puts ("\nMulticast tftp done\n");
+ puts("\nMulticast tftp done\n");
mcast_cleanup();
NetState = NETLOOP_SUCCESS;
}
@@ -490,14 +492,14 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
TftpNumchars++;
}
#endif
- puts ("\ndone\n");
+ puts("\ndone\n");
NetState = NETLOOP_SUCCESS;
}
break;
case TFTP_ERROR:
- printf ("\nTFTP error: '%s' (%d)\n",
- pkt + 2, ntohs(*(ushort *)pkt));
+ printf("\nTFTP error: '%s' (%d)\n",
+ pkt + 2, ntohs(*(ushort *)pkt));
switch (ntohs(*(ushort *)pkt)) {
case TFTP_ERR_FILE_NOT_FOUND:
@@ -525,24 +527,24 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
static void
-TftpTimeout (void)
+TftpTimeout(void)
{
if (++TftpTimeoutCount > TftpTimeoutCountMax) {
- puts ("\nRetry count exceeded; starting again\n");
+ puts("\nRetry count exceeded; starting again\n");
#ifdef CONFIG_MCAST_TFTP
mcast_cleanup();
#endif
- NetStartAgain ();
+ NetStartAgain();
} else {
- puts ("T ");
- NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
- TftpSend ();
+ puts("T ");
+ NetSetTimeout(TftpTimeoutMSecs, TftpTimeout);
+ TftpSend();
}
}
void
-TftpStart (void)
+TftpStart(void)
{
char *ep; /* Environment pointer */
@@ -572,28 +574,28 @@ TftpStart (void)
NetOurIP & 0xFF,
(NetOurIP >> 8) & 0xFF,
(NetOurIP >> 16) & 0xFF,
- (NetOurIP >> 24) & 0xFF );
+ (NetOurIP >> 24) & 0xFF);
strncpy(tftp_filename, default_filename, MAX_LEN);
tftp_filename[MAX_LEN-1] = 0;
- printf ("*** Warning: no boot file name; using '%s'\n",
+ printf("*** Warning: no boot file name; using '%s'\n",
tftp_filename);
} else {
- char *p = strchr (BootFile, ':');
+ char *p = strchr(BootFile, ':');
if (p == NULL) {
strncpy(tftp_filename, BootFile, MAX_LEN);
tftp_filename[MAX_LEN-1] = 0;
} else {
- TftpServerIP = string_to_ip (BootFile);
+ TftpServerIP = string_to_ip(BootFile);
strncpy(tftp_filename, p + 1, MAX_LEN);
tftp_filename[MAX_LEN-1] = 0;
}
}
#if defined(CONFIG_NET_MULTI)
- printf ("Using %s device\n", eth_get_name());
+ printf("Using %s device\n", eth_get_name());
#endif
printf("TFTP from server %pI4"
"; our IP address is %pI4", &TftpServerIP, &NetOurIP);
@@ -606,25 +608,25 @@ TftpStart (void)
if (OurNet != ServerNet)
printf("; sending through gateway %pI4", &NetOurGatewayIP);
}
- putc ('\n');
+ putc('\n');
- printf ("Filename '%s'.", tftp_filename);
+ printf("Filename '%s'.", tftp_filename);
if (NetBootFileSize) {
- printf (" Size is 0x%x Bytes = ", NetBootFileSize<<9);
- print_size (NetBootFileSize<<9, "");
+ printf(" Size is 0x%x Bytes = ", NetBootFileSize<<9);
+ print_size(NetBootFileSize<<9, "");
}
- putc ('\n');
+ putc('\n');
- printf ("Load address: 0x%lx\n", load_addr);
+ printf("Load address: 0x%lx\n", load_addr);
- puts ("Loading: *\b");
+ puts("Loading: *\b");
TftpTimeoutCountMax = TftpRRQTimeoutCountMax;
- NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
- NetSetHandler (TftpHandler);
+ NetSetTimeout(TftpTimeoutMSecs, TftpTimeout);
+ NetSetHandler(TftpHandler);
TftpServerPort = WELL_KNOWN_PORT;
TftpTimeoutCount = 0;
@@ -637,7 +639,7 @@ TftpStart (void)
TftpServerPort = simple_strtol(ep, NULL, 10);
}
if ((ep = getenv("tftpsrcp")) != NULL) {
- TftpOurPort= simple_strtol(ep, NULL, 10);
+ TftpOurPort = simple_strtol(ep, NULL, 10);
}
#endif
TftpBlock = 0;
@@ -654,7 +656,7 @@ TftpStart (void)
TftpNumchars = 0;
#endif
- TftpSend ();
+ TftpSend();
}
#ifdef CONFIG_MCAST_TFTP
@@ -675,23 +677,23 @@ TftpStart (void)
*/
static void parse_multicast_oack(char *pkt, int len)
{
- int i;
- IPaddr_t addr;
- char *mc_adr, *port, *mc;
+ int i;
+ IPaddr_t addr;
+ char *mc_adr, *port, *mc;
- mc_adr=port=mc=NULL;
+ mc_adr = port = mc = NULL;
/* march along looking for 'multicast\0', which has to start@least
* 14 bytes back from the end.
*/
- for (i=0;i<len-14;i++)
- if (strcmp (pkt+i,"multicast") == 0)
+ for (i = 0; i < len-14; i++)
+ if (strcmp(pkt+i, "multicast") == 0)
break;
if (i >= (len-14)) /* non-Multicast OACK, ign. */
return;
- i+=10; /* strlen multicast */
+ i += 10; /* strlen multicast */
mc_adr = pkt+i;
- for (;i<len;i++) {
+ for (; i < len; i++) {
if (*(pkt+i) == ',') {
*(pkt+i) = '\0';
if (port) {
@@ -702,29 +704,29 @@ 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");
+ printf("I got a OACK as master Client, WRONG!\n");
return;
}
/* ..I now accept packets destined for this MCAST addr, port */
if (!Multicast) {
if (Bitmap) {
- printf ("Internal failure! no mcast.\n");
+ printf("Internal failure! no mcast.\n");
free(Bitmap);
- Bitmap=NULL;
- ProhibitMcast=1;
+ Bitmap = NULL;
+ ProhibitMcast = 1;
return ;
}
/* I malloc instead of pre-declare; so that if the file ends
* up being too big for this bitmap I can retry
*/
- if (!(Bitmap = malloc (Mapsize))) {
- printf ("No Bitmap, no multicast. Sorry.\n");
- ProhibitMcast=1;
+ if (!(Bitmap = malloc(Mapsize))) {
+ printf("No Bitmap, no multicast. Sorry.\n");
+ ProhibitMcast = 1;
return;
}
- memset (Bitmap,0,Mapsize);
+ memset(Bitmap, 0, Mapsize);
PrevBitmapHole = 0;
Multicast = 1;
}
@@ -732,16 +734,16 @@ static void parse_multicast_oack(char *pkt, int len)
if (Mcast_addr != addr) {
if (Mcast_addr)
eth_mcast_join(Mcast_addr, 0);
- if (eth_mcast_join(Mcast_addr=addr, 1)) {
- printf ("Fail to set mcast, revert to TFTP\n");
- ProhibitMcast=1;
+ if (eth_mcast_join(Mcast_addr = addr, 1)) {
+ printf("Fail to set mcast, revert to TFTP\n");
+ ProhibitMcast = 1;
mcast_cleanup();
NetStartAgain();
}
}
- MasterClient = (unsigned char)simple_strtoul((char *)mc,NULL,10);
- Mcast_port = (unsigned short)simple_strtoul(port,NULL,10);
- printf ("Multicast: %s:%d [%d]\n", mc_adr, Mcast_port, MasterClient);
+ MasterClient = (unsigned char)simple_strtoul((char *)mc, NULL, 10);
+ Mcast_port = (unsigned short)simple_strtoul(port, NULL, 10);
+ printf("Multicast: %s:%d [%d]\n", mc_adr, Mcast_port, MasterClient);
return;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 3/8] net/tftp.c: cosmetic: fix pointer syntax issues
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
2011-05-14 15:49 ` [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters Luca Ceresoli
2011-05-14 15:49 ` [U-Boot] [PATCH 2/8] net/tftp.c: cosmetic: fix whitespace issues Luca Ceresoli
@ 2011-05-14 15:49 ` Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:49 ` [U-Boot] [PATCH 4/8] net/tftp.c: cosmetic: do not use assignment in if condition Luca Ceresoli
` (4 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:49 UTC (permalink / raw)
To: u-boot
This removes the following checkpatch issues:
- ERROR: "foo * bar" should be "foo *bar"
- ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
---
net/tftp.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index c0342a8..4c05266 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -146,7 +146,7 @@ mcast_cleanup(void)
#endif /* CONFIG_MCAST_TFTP */
static __inline__ void
-store_block(unsigned block, uchar * src, unsigned len)
+store_block(unsigned block, uchar *src, unsigned len)
{
ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
ulong newsize = offset + len;
@@ -193,9 +193,9 @@ static void TftpTimeout(void);
static void
TftpSend(void)
{
- volatile uchar * pkt;
- volatile uchar * xp;
- int len = 0;
+ volatile uchar *pkt;
+ volatile uchar *xp;
+ int len = 0;
volatile ushort *s;
#ifdef CONFIG_MCAST_TFTP
@@ -340,19 +340,19 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
* something like "len-8" may give a *huge* number
*/
for (i = 0; i+8 < len; i++) {
- if (strcmp((char*)pkt+i, "blksize") == 0) {
+ if (strcmp((char *)pkt+i, "blksize") == 0) {
TftpBlkSize = (unsigned short)
- simple_strtoul((char*)pkt+i+8, NULL,
+ simple_strtoul((char *)pkt+i+8, NULL,
10);
debug("Blocksize ack: %s, %d\n",
- (char*)pkt+i+8, TftpBlkSize);
+ (char *)pkt+i+8, TftpBlkSize);
}
#ifdef CONFIG_TFTP_TSIZE
- if (strcmp((char*)pkt+i, "tsize") == 0) {
- TftpTsize = simple_strtoul((char*)pkt+i+6,
+ if (strcmp((char *)pkt+i, "tsize") == 0) {
+ TftpTsize = simple_strtoul((char *)pkt+i+6,
NULL, 10);
debug("size = %s, %d\n",
- (char*)pkt+i+6, TftpTsize);
+ (char *)pkt+i+6, TftpTsize);
}
#endif
}
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 4/8] net/tftp.c: cosmetic: do not use assignment in if condition
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
` (2 preceding siblings ...)
2011-05-14 15:49 ` [U-Boot] [PATCH 3/8] net/tftp.c: cosmetic: fix pointer syntax issues Luca Ceresoli
@ 2011-05-14 15:49 ` Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 5/8] net/tftp.c: cosmetic: fix brace issues Luca Ceresoli
` (3 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:49 UTC (permalink / raw)
To: u-boot
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>
---
net/tftp.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index 4c05266..81b7aa5 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -552,10 +552,12 @@ TftpStart(void)
* Allow the user to choose TFTP blocksize and timeout.
* 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);
- if ((ep = getenv("tftptimeout")) != NULL)
+ ep = getenv("tftptimeout");
+ if (ep != NULL)
TftpTimeoutMSecs = simple_strtol(ep, NULL, 10);
if (TftpTimeoutMSecs < 1000) {
@@ -635,10 +637,12 @@ TftpStart(void)
TftpOurPort = 1024 + (get_timer(0) % 3072);
#ifdef CONFIG_TFTP_PORT
- if ((ep = getenv("tftpdstp")) != NULL) {
+ ep = getenv("tftpdstp");
+ if (ep != NULL) {
TftpServerPort = simple_strtol(ep, NULL, 10);
}
- if ((ep = getenv("tftpsrcp")) != NULL) {
+ ep = getenv("tftpsrcp");
+ if (ep != NULL) {
TftpOurPort = simple_strtol(ep, NULL, 10);
}
#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
* 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");
ProhibitMcast = 1;
return;
@@ -734,7 +739,8 @@ static void parse_multicast_oack(char *pkt, int len)
if (Mcast_addr != addr) {
if (Mcast_addr)
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");
ProhibitMcast = 1;
mcast_cleanup();
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 5/8] net/tftp.c: cosmetic: fix brace issues
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
` (3 preceding siblings ...)
2011-05-14 15:49 ` [U-Boot] [PATCH 4/8] net/tftp.c: cosmetic: do not use assignment in if condition Luca Ceresoli
@ 2011-05-14 15:50 ` Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 6/8] net/tftp.c: cosmetic: trailing statements should be on next line Luca Ceresoli
` (2 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:50 UTC (permalink / raw)
To: u-boot
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 | 17 ++++++-----------
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;
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 6/8] net/tftp.c: cosmetic: trailing statements should be on next line
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
` (4 preceding siblings ...)
2011-05-14 15:50 ` [U-Boot] [PATCH 5/8] net/tftp.c: cosmetic: fix brace issues Luca Ceresoli
@ 2011-05-14 15:50 ` Luca Ceresoli
2011-05-19 19:37 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 7/8] net/tftp.c: cosmetic: fix indentation Luca Ceresoli
2011-05-14 15:50 ` [U-Boot] [PATCH 8/8] net/tftp.c: cosmetic: do not initialise statics to 0 or NULL Luca Ceresoli
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:50 UTC (permalink / raw)
To: u-boot
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(-)
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;
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 7/8] net/tftp.c: cosmetic: fix indentation
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
` (5 preceding siblings ...)
2011-05-14 15:50 ` [U-Boot] [PATCH 6/8] net/tftp.c: cosmetic: trailing statements should be on next line Luca Ceresoli
@ 2011-05-14 15:50 ` Luca Ceresoli
2011-05-19 19:37 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 8/8] net/tftp.c: cosmetic: do not initialise statics to 0 or NULL Luca Ceresoli
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:50 UTC (permalink / raw)
To: u-boot
This removes the following checkpatch issue:
- WARNING: suspect code indent for conditional statements
Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
---
net/tftp.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index f83c0d6..a52f54c 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -307,7 +307,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
if (Multicast
&& (!Mcast_port || (dest != Mcast_port)))
#endif
- return;
+ return;
}
if (TftpState != STATE_RRQ && src != TftpServerPort)
return;
@@ -603,11 +603,12 @@ TftpStart(void)
/* Check if we need to send across this subnet */
if (NetOurGatewayIP && NetOurSubnetMask) {
- IPaddr_t OurNet = NetOurIP & NetOurSubnetMask;
- IPaddr_t ServerNet = TftpServerIP & NetOurSubnetMask;
+ IPaddr_t OurNet = NetOurIP & NetOurSubnetMask;
+ IPaddr_t ServerNet = TftpServerIP & NetOurSubnetMask;
- if (OurNet != ServerNet)
- printf("; sending through gateway %pI4", &NetOurGatewayIP);
+ if (OurNet != ServerNet)
+ printf("; sending through gateway %pI4",
+ &NetOurGatewayIP);
}
putc('\n');
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 8/8] net/tftp.c: cosmetic: do not initialise statics to 0 or NULL
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
` (6 preceding siblings ...)
2011-05-14 15:50 ` [U-Boot] [PATCH 7/8] net/tftp.c: cosmetic: fix indentation Luca Ceresoli
@ 2011-05-14 15:50 ` Luca Ceresoli
2011-05-19 19:37 ` Wolfgang Denk
7 siblings, 1 reply; 17+ messages in thread
From: Luca Ceresoli @ 2011-05-14 15:50 UTC (permalink / raw)
To: u-boot
This removes the following checkpatch issue:
- ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
---
net/tftp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index a52f54c..0f74e6b 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -125,8 +125,8 @@ static unsigned short TftpBlkSizeOption = TFTP_MTU_BLOCKSIZE;
#define MTFTP_BITMAPSIZE 0x1000
static unsigned *Bitmap;
static int PrevBitmapHole, Mapsize = MTFTP_BITMAPSIZE;
-static uchar ProhibitMcast = 0, MasterClient = 0;
-static uchar Multicast = 0;
+static uchar ProhibitMcast, MasterClient;
+static uchar Multicast;
extern IPaddr_t Mcast_addr;
static int Mcast_port;
static ulong TftpEndingBlock; /* can get 'last' block before done..*/
--
1.7.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters
2011-05-14 15:49 ` [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters Luca Ceresoli
@ 2011-05-19 19:36 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:36 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-2-git-send-email-luca.ceresoli@comelit.it> you wrote:
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> net/tftp.c | 66 ++++++++++++++++++++++++++++++++++++++---------------------
> 1 files changed, 42 insertions(+), 24 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Unibus timeout fatal trap program lost sorry" - An error message
printed by DEC's RSTS operating system for the PDP-11
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 2/8] net/tftp.c: cosmetic: fix whitespace issues
2011-05-14 15:49 ` [U-Boot] [PATCH 2/8] net/tftp.c: cosmetic: fix whitespace issues Luca Ceresoli
@ 2011-05-19 19:36 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:36 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-3-git-send-email-luca.ceresoli@comelit.it> you wrote:
> This removes the following checkpatch issues:
> - ERROR: space prohibited before that close parenthesis ')'
> - ERROR: space required after that ';' (ctx:BxV)
> - ERROR: space required after that ',' (ctx:VxV)
> - ERROR: space required after that ';' (ctx:VxV)
> - ERROR: spaces required around that '<<=' (ctx:VxV)
> - ERROR: spaces required around that '<' (ctx:VxV)
> - ERROR: spaces required around that '=' (ctx:VxV)
> - ERROR: spaces required around that '+=' (ctx:VxV)
> - ERROR: spaces required around that '=' (ctx:VxW)
> - WARNING: please, no spaces at the start of a line
> - WARNING: space prohibited between function name and open parenthesis '('
>
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> net/tftp.c | 192 ++++++++++++++++++++++++++++++------------------------------
> 1 files changed, 97 insertions(+), 95 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Witch! Witch! They'll burn ya!
-- Hag, "Tomorrow is Yesterday", stardate unknown
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 3/8] net/tftp.c: cosmetic: fix pointer syntax issues
2011-05-14 15:49 ` [U-Boot] [PATCH 3/8] net/tftp.c: cosmetic: fix pointer syntax issues Luca Ceresoli
@ 2011-05-19 19:36 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:36 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-4-git-send-email-luca.ceresoli@comelit.it> you wrote:
> This removes the following checkpatch issues:
> - ERROR: "foo * bar" should be "foo *bar"
> - ERROR: "(foo*)" should be "(foo *)"
>
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> net/tftp.c | 20 ++++++++++----------
> 1 files changed, 10 insertions(+), 10 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If some day we are defeated, well, war has its fortunes, good and
bad.
-- Commander Kor, "Errand of Mercy", stardate 3201.7
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 4/8] net/tftp.c: cosmetic: do not use assignment in if condition
2011-05-14 15:49 ` [U-Boot] [PATCH 4/8] net/tftp.c: cosmetic: do not use assignment in if condition Luca Ceresoli
@ 2011-05-19 19:36 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:36 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-5-git-send-email-luca.ceresoli@comelit.it> you wrote:
> 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>
> ---
> net/tftp.c | 18 ++++++++++++------
> 1 files changed, 12 insertions(+), 6 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"It's hard to believe that something which is neither seen nor felt
can do so much harm."
"That's true. But an idea can't be seen or felt. And that's what kept
the Troglytes in the mines all these centuries. A mistaken idea."
-- Vanna and Kirk, "The Cloud Minders", stardate 5819.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 5/8] net/tftp.c: cosmetic: fix brace issues
2011-05-14 15:50 ` [U-Boot] [PATCH 5/8] net/tftp.c: cosmetic: fix brace issues Luca Ceresoli
@ 2011-05-19 19:36 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:36 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-6-git-send-email-luca.ceresoli@comelit.it> you wrote:
> 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 | 17 ++++++-----------
> 1 files changed, 6 insertions(+), 11 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Without freedom of choice there is no creativity.
-- Kirk, "The return of the Archons", stardate 3157.4
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 6/8] net/tftp.c: cosmetic: trailing statements should be on next line
2011-05-14 15:50 ` [U-Boot] [PATCH 6/8] net/tftp.c: cosmetic: trailing statements should be on next line Luca Ceresoli
@ 2011-05-19 19:37 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:37 UTC (permalink / raw)
To: u-boot
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
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You see but you do not observe.
Sir Arthur Conan Doyle, in "The Memoirs of Sherlock Holmes"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 7/8] net/tftp.c: cosmetic: fix indentation
2011-05-14 15:50 ` [U-Boot] [PATCH 7/8] net/tftp.c: cosmetic: fix indentation Luca Ceresoli
@ 2011-05-19 19:37 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:37 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-8-git-send-email-luca.ceresoli@comelit.it> you wrote:
> This removes the following checkpatch issue:
> - WARNING: suspect code indent for conditional statements
>
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> net/tftp.c | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A day without sunshine is like night.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 8/8] net/tftp.c: cosmetic: do not initialise statics to 0 or NULL
2011-05-14 15:50 ` [U-Boot] [PATCH 8/8] net/tftp.c: cosmetic: do not initialise statics to 0 or NULL Luca Ceresoli
@ 2011-05-19 19:37 ` Wolfgang Denk
0 siblings, 0 replies; 17+ messages in thread
From: Wolfgang Denk @ 2011-05-19 19:37 UTC (permalink / raw)
To: u-boot
Dear Luca Ceresoli,
In message <1305388203-22983-9-git-send-email-luca.ceresoli@comelit.it> you wrote:
> This removes the following checkpatch issue:
> - ERROR: do not initialise statics to 0 or NULL
>
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> net/tftp.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"You know, after a woman's raised a family and so on, she wants to
start living her own life." "Whose life she's _been_ living, then?"
- Terry Pratchett, _Witches Abroad_
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2011-05-19 19:37 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-14 15:49 [U-Boot] [PATCH 0/8] net/tftp.c: clenups for checkpatch compliance Luca Ceresoli
2011-05-14 15:49 ` [U-Boot] [PATCH 1/8] net/tftp.c: cosmetic: fix lines over 80 characters Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:49 ` [U-Boot] [PATCH 2/8] net/tftp.c: cosmetic: fix whitespace issues Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:49 ` [U-Boot] [PATCH 3/8] net/tftp.c: cosmetic: fix pointer syntax issues Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:49 ` [U-Boot] [PATCH 4/8] net/tftp.c: cosmetic: do not use assignment in if condition Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 5/8] net/tftp.c: cosmetic: fix brace issues Luca Ceresoli
2011-05-19 19:36 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 6/8] net/tftp.c: cosmetic: trailing statements should be on next line Luca Ceresoli
2011-05-19 19:37 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 7/8] net/tftp.c: cosmetic: fix indentation Luca Ceresoli
2011-05-19 19:37 ` Wolfgang Denk
2011-05-14 15:50 ` [U-Boot] [PATCH 8/8] net/tftp.c: cosmetic: do not initialise statics to 0 or NULL Luca Ceresoli
2011-05-19 19:37 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.