[U-Boot] [PATCH v2 1/9] FAT: cosmetic: Remove extra spaces
Remove spaces before opening parentheses in function calls.
Signed-off-by: Benoît Thébaudeau benoit.thebaudeau@advansee.com Cc: Wolfgang Denk wd@denx.de --- Changes for v2: - New patch for this version of the series.
.../fs/fat/fat.c | 44 ++++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-)
diff --git u-boot-66714b1.orig/fs/fat/fat.c u-boot-66714b1/fs/fat/fat.c index bc46cc5..9f83572 100644 --- u-boot-66714b1.orig/fs/fat/fat.c +++ u-boot-66714b1/fs/fat/fat.c @@ -37,7 +37,7 @@ /* * Convert a string to lowercase. */ -static void downcase (char *str) +static void downcase(char *str) { while (*str != '\0') { TOLOWER(*str); @@ -62,7 +62,7 @@ static int disk_read(__u32 block, __u32 nr_blocks, void *buf) cur_part_info.start + block, nr_blocks, buf); }
-int fat_register_device (block_dev_desc_t * dev_desc, int part_no) +int fat_register_device(block_dev_desc_t * dev_desc, int part_no) { ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
@@ -127,7 +127,7 @@ int fat_register_device (block_dev_desc_t * dev_desc, int part_no) * Get the first occurence of a directory delimiter ('/' or '') in a string. * Return index into string if found, -1 otherwise. */ -static int dirdelim (char *str) +static int dirdelim(char *str) { char *start = str;
@@ -142,7 +142,7 @@ static int dirdelim (char *str) /* * Extract zero terminated short name from a directory entry. */ -static void get_name (dir_entry *dirent, char *s_name) +static void get_name(dir_entry *dirent, char *s_name) { char *ptr;
@@ -171,7 +171,7 @@ static void get_name (dir_entry *dirent, char *s_name) * Get the entry at index 'entry' in a FAT (12/16/32) table. * On failure 0x00 is returned. */ -static __u32 get_fatent (fsdata *mydata, __u32 entry) +static __u32 get_fatent(fsdata *mydata, __u32 entry) { __u32 bufnum; __u32 off16, offset; @@ -270,8 +270,7 @@ static __u32 get_fatent (fsdata *mydata, __u32 entry) * Return 0 on success, -1 otherwise. */ static int -get_cluster (fsdata *mydata, __u32 clustnum, __u8 *buffer, - unsigned long size) +get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) { __u32 idx = 0; __u32 startsect; @@ -317,8 +316,8 @@ get_cluster (fsdata *mydata, __u32 clustnum, __u8 *buffer, * Return the number of bytes read or -1 on fatal errors. */ static long -get_contents (fsdata *mydata, dir_entry *dentptr, __u8 *buffer, - unsigned long maxsize) +get_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer, + unsigned long maxsize) { unsigned long filesize = FAT2CPU32(dentptr->size), gotsize = 0; unsigned int bytesperclust = mydata->clust_size * mydata->sect_size; @@ -397,7 +396,7 @@ getit: * starting at l_name[*idx]. * Return 1 if terminator (zero byte) is found, 0 otherwise. */ -static int slot2str (dir_slot *slotptr, char *l_name, int *idx) +static int slot2str(dir_slot *slotptr, char *l_name, int *idx) { int j;
@@ -433,8 +432,8 @@ __u8 get_vfatname_block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
static int -get_vfatname (fsdata *mydata, int curclust, __u8 *cluster, - dir_entry *retdent, char *l_name) +get_vfatname(fsdata *mydata, int curclust, __u8 *cluster, + dir_entry *retdent, char *l_name) { dir_entry *realdent; dir_slot *slotptr = (dir_slot *)retdent; @@ -516,7 +515,7 @@ get_vfatname (fsdata *mydata, int curclust, __u8 *cluster, }
/* Calculate short name checksum */ -static __u8 mkcksum (const char *str) +static __u8 mkcksum(const char *str) { int i;
@@ -537,9 +536,9 @@ static __u8 mkcksum (const char *str) __u8 get_dentfromdir_block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
-static dir_entry *get_dentfromdir (fsdata *mydata, int startsect, - char *filename, dir_entry *retdent, - int dols) +static dir_entry *get_dentfromdir(fsdata *mydata, int startsect, + char *filename, dir_entry *retdent, + int dols) { __u16 prevcksum = 0xffff; __u32 curclust = START(retdent); @@ -699,7 +698,7 @@ static dir_entry *get_dentfromdir (fsdata *mydata, int startsect, * Read boot sector and volume info from a FAT filesystem */ static int -read_bootsectandvi (boot_sector *bs, volume_info *volinfo, int *fatsize) +read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) { __u8 *block; volume_info *vistart; @@ -716,7 +715,7 @@ read_bootsectandvi (boot_sector *bs, volume_info *volinfo, int *fatsize) return -1; }
- if (disk_read (0, 1, block) < 0) { + if (disk_read(0, 1, block) < 0) { debug("Error: reading block\n"); goto fail; } @@ -770,8 +769,7 @@ __u8 do_fat_read_block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
long -do_fat_read (const char *filename, void *buffer, unsigned long maxsize, - int dols) +do_fat_read(const char *filename, void *buffer, unsigned long maxsize, int dols) { char fnamecopy[2048]; boot_sector bs; @@ -1114,7 +1112,7 @@ exit: return ret; }
-int file_fat_detectfs (void) +int file_fat_detectfs(void) { boot_sector bs; volume_info volinfo; @@ -1177,12 +1175,12 @@ int file_fat_detectfs (void) return 0; }
-int file_fat_ls (const char *dir) +int file_fat_ls(const char *dir) { return do_fat_read(dir, NULL, 0, LS_YES); }
-long file_fat_read (const char *filename, void *buffer, unsigned long maxsize) +long file_fat_read(const char *filename, void *buffer, unsigned long maxsize) { printf("reading %s\n", filename); return do_fat_read(filename, buffer, maxsize, LS_NO);
Argh, it was 1/8 actually, not 1/9...
----- Original Message -----
From: "Benoît Thébaudeau" benoit.thebaudeau@advansee.com To: u-boot@lists.denx.de Cc: "Wolfgang Denk" wd@denx.de, "Mike Frysinger" vapier@gentoo.org Sent: Friday, July 20, 2012 3:18:44 PM Subject: [PATCH v2 1/9] FAT: cosmetic: Remove extra spaces
Remove spaces before opening parentheses in function calls.
Signed-off-by: Benoît Thébaudeau benoit.thebaudeau@advansee.com Cc: Wolfgang Denk wd@denx.de
Changes for v2:
- New patch for this version of the series.
.../fs/fat/fat.c | 44 ++++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-)
diff --git u-boot-66714b1.orig/fs/fat/fat.c u-boot-66714b1/fs/fat/fat.c index bc46cc5..9f83572 100644 --- u-boot-66714b1.orig/fs/fat/fat.c +++ u-boot-66714b1/fs/fat/fat.c @@ -37,7 +37,7 @@ /*
- Convert a string to lowercase.
*/ -static void downcase (char *str) +static void downcase(char *str) { while (*str != '\0') { TOLOWER(*str); @@ -62,7 +62,7 @@ static int disk_read(__u32 block, __u32 nr_blocks, void *buf) cur_part_info.start + block, nr_blocks, buf); }
-int fat_register_device (block_dev_desc_t * dev_desc, int part_no) +int fat_register_device(block_dev_desc_t * dev_desc, int part_no) { ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
@@ -127,7 +127,7 @@ int fat_register_device (block_dev_desc_t * dev_desc, int part_no)
- Get the first occurence of a directory delimiter ('/' or '') in
a string.
- Return index into string if found, -1 otherwise.
*/ -static int dirdelim (char *str) +static int dirdelim(char *str) { char *start = str;
@@ -142,7 +142,7 @@ static int dirdelim (char *str) /*
- Extract zero terminated short name from a directory entry.
*/ -static void get_name (dir_entry *dirent, char *s_name) +static void get_name(dir_entry *dirent, char *s_name) { char *ptr;
@@ -171,7 +171,7 @@ static void get_name (dir_entry *dirent, char *s_name)
- Get the entry at index 'entry' in a FAT (12/16/32) table.
- On failure 0x00 is returned.
*/ -static __u32 get_fatent (fsdata *mydata, __u32 entry) +static __u32 get_fatent(fsdata *mydata, __u32 entry) { __u32 bufnum; __u32 off16, offset; @@ -270,8 +270,7 @@ static __u32 get_fatent (fsdata *mydata, __u32 entry)
- Return 0 on success, -1 otherwise.
*/ static int -get_cluster (fsdata *mydata, __u32 clustnum, __u8 *buffer,
unsigned long size)+get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) { __u32 idx = 0; __u32 startsect; @@ -317,8 +316,8 @@ get_cluster (fsdata *mydata, __u32 clustnum, __u8 *buffer,
- Return the number of bytes read or -1 on fatal errors.
*/ static long -get_contents (fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
unsigned long maxsize)+get_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
unsigned long maxsize){ unsigned long filesize = FAT2CPU32(dentptr->size), gotsize = 0; unsigned int bytesperclust = mydata->clust_size * mydata->sect_size; @@ -397,7 +396,7 @@ getit:
- starting at l_name[*idx].
- Return 1 if terminator (zero byte) is found, 0 otherwise.
*/ -static int slot2str (dir_slot *slotptr, char *l_name, int *idx) +static int slot2str(dir_slot *slotptr, char *l_name, int *idx) { int j;
@@ -433,8 +432,8 @@ __u8 get_vfatname_block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
static int -get_vfatname (fsdata *mydata, int curclust, __u8 *cluster,
dir_entry *retdent, char *l_name)+get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
dir_entry *retdent, char *l_name){ dir_entry *realdent; dir_slot *slotptr = (dir_slot *)retdent; @@ -516,7 +515,7 @@ get_vfatname (fsdata *mydata, int curclust, __u8 *cluster, }
/* Calculate short name checksum */ -static __u8 mkcksum (const char *str) +static __u8 mkcksum(const char *str) { int i;
@@ -537,9 +536,9 @@ static __u8 mkcksum (const char *str) __u8 get_dentfromdir_block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
-static dir_entry *get_dentfromdir (fsdata *mydata, int startsect,
char *filename, dir_entry *retdent,int dols)+static dir_entry *get_dentfromdir(fsdata *mydata, int startsect,
char *filename, dir_entry *retdent,int dols){ __u16 prevcksum = 0xffff; __u32 curclust = START(retdent); @@ -699,7 +698,7 @@ static dir_entry *get_dentfromdir (fsdata *mydata, int startsect,
- Read boot sector and volume info from a FAT filesystem
*/ static int -read_bootsectandvi (boot_sector *bs, volume_info *volinfo, int *fatsize) +read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) { __u8 *block; volume_info *vistart; @@ -716,7 +715,7 @@ read_bootsectandvi (boot_sector *bs, volume_info *volinfo, int *fatsize) return -1; }
- if (disk_read (0, 1, block) < 0) {
- if (disk_read(0, 1, block) < 0) { debug("Error: reading block\n"); goto fail; }
@@ -770,8 +769,7 @@ __u8 do_fat_read_block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
long -do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
int dols)+do_fat_read(const char *filename, void *buffer, unsigned long maxsize, int dols) { char fnamecopy[2048]; boot_sector bs; @@ -1114,7 +1112,7 @@ exit: return ret; }
-int file_fat_detectfs (void) +int file_fat_detectfs(void) { boot_sector bs; volume_info volinfo; @@ -1177,12 +1175,12 @@ int file_fat_detectfs (void) return 0; }
-int file_fat_ls (const char *dir) +int file_fat_ls(const char *dir) { return do_fat_read(dir, NULL, 0, LS_YES); }
-long file_fat_read (const char *filename, void *buffer, unsigned long maxsize) +long file_fat_read(const char *filename, void *buffer, unsigned long maxsize) { printf("reading %s\n", filename); return do_fat_read(filename, buffer, maxsize, LS_NO);
Dear Mike,
On Sat, Jul 21, 2012 at 07:23:57 PM, Mike Frysinger wrote:
Acked-by: Mike Frysinger vapier@gentoo.org
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
Regards, Benoît
Dear =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?=,
In message 845266616.705298.1343398892482.JavaMail.root@advansee.com you wrote:
On Sat, Jul 21, 2012 at 07:23:57 PM, Mike Frysinger wrote:
Acked-by: Mike Frysinger vapier@gentoo.org
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
They end on my table, and probably get merged when the next merge window opens. See http://www.denx.de/wiki/U-Boot/ReleaseCycle
Best regards,
Wolfgang Denk
Dear Wolfgang Denk,
On Fri, Jul 27, 2012 at 04:29:41 PM, Wolfgang Denk wrote:
Dear =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?=,
In message 845266616.705298.1343398892482.JavaMail.root@advansee.com you wrote:
On Sat, Jul 21, 2012 at 07:23:57 PM, Mike Frysinger wrote:
Acked-by: Mike Frysinger vapier@gentoo.org
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
They end on my table, and probably get merged when the next merge window opens. See http://www.denx.de/wiki/U-Boot/ReleaseCycle
Can you apply it now that the merge window is open?
Thanks in advance.
Best regards, Benoît
On Sat, Aug 4, 2012 at 01:11:16 AM, Benoît Thébaudeau wrote:
Dear Wolfgang Denk,
On Fri, Jul 27, 2012 at 04:29:41 PM, Wolfgang Denk wrote:
Dear =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?=,
In message 845266616.705298.1343398892482.JavaMail.root@advansee.com you wrote:
On Sat, Jul 21, 2012 at 07:23:57 PM, Mike Frysinger wrote:
Acked-by: Mike Frysinger vapier@gentoo.org
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
They end on my table, and probably get merged when the next merge window opens. See http://www.denx.de/wiki/U-Boot/ReleaseCycle
Can you apply it now that the merge window is open?
Thanks in advance.
Can someone answer, please?
Best regards, Benoît
Hi Mike,
On Fri, Aug 10, 2012 at 04:41:51 PM, Benoît Thébaudeau wrote:
On Sat, Aug 4, 2012 at 01:11:16 AM, Benoît Thébaudeau wrote:
Dear Wolfgang Denk,
On Fri, Jul 27, 2012 at 04:29:41 PM, Wolfgang Denk wrote:
Dear =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?=,
In message 845266616.705298.1343398892482.JavaMail.root@advansee.com you wrote:
On Sat, Jul 21, 2012 at 07:23:57 PM, Mike Frysinger wrote:
Acked-by: Mike Frysinger vapier@gentoo.org
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
They end on my table, and probably get merged when the next merge window opens. See http://www.denx.de/wiki/U-Boot/ReleaseCycle
Can you apply it now that the merge window is open?
Thanks in advance.
Can someone answer, please?
Do you have any idea why nobody applies this series and answers? Who is the fs custodian? Wolfgang since I can't find a custodian defined for fs, no? Is it because of vacations or something? I'd like if this series could be applied before the end of the current merge window.
Best regards, Benoît
Dear =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?=,
you wrote:
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
And I explained to you:
They end on my table, and probably get merged when the next merge window opens. See http://www.denx.de/wiki/U-Boot/ReleaseCycle
But you continue to ask again and again and again:
Can you apply it now that the merge window is open?
...
Can someone answer, please?
Do you have any idea why nobody applies this series and answers? Who is the fs custodian? Wolfgang since I can't find a custodian defined for fs, no? Is it because of vacations or something? I'd like if this series could be applied before the end of the current merge window.
Didn't I tell you that these will be handled by me? The when depends on when I find time to do this. I have a lot of patches on my stack, and usually I process these sequentially, and not in the order of the "priority" as the submitter wants to assign. It is perfectly OK to send a reminder when there is nothing happening, or when the merge window closes and I call for unprecessed patches to be flagged, but frankly, you ask a bit too often. You may want to read http://www.catb.org/~esr/faqs/smart-questions.html#urgent ...
Best regards,
Wolfgang Denk
Dear Wolfgang Denk,
Dear =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?=,
you wrote:
If it's ack'ed, why does nobody apply it? What is the normal life cycle of patches like these that don't have a custodian?
And I explained to you:
They end on my table, and probably get merged when the next merge window opens. See http://www.denx.de/wiki/U-Boot/ReleaseCycle
But you continue to ask again and again and again:
Can you apply it now that the merge window is open?
...
Can someone answer, please?
Do you have any idea why nobody applies this series and answers? Who is the fs custodian? Wolfgang since I can't find a custodian defined for fs, no? Is it because of vacations or something? I'd like if this series could be applied before the end of the current merge window.
Didn't I tell you that these will be handled by me? The when depends on when I find time to do this. I have a lot of patches on my stack, and usually I process these sequentially, and not in the order of the "priority" as the submitter wants to assign. It is perfectly OK to send a reminder when there is nothing happening, or when the merge window closes and I call for unprecessed patches to be flagged, but frankly, you ask a bit too often. You may want to read http://www.catb.org/~esr/faqs/smart-questions.html#urgent ...
Understood. Sorry for the noise. I'm still new to U-Boot mailing list, so I'm learning the rules and timings progressively. I was not asking for priority over others. It's just that you said you handled such patches when the next merge window opens, but then nothing happened when the merge window opened, even after a few weeks, so I was wondering why. Now it's clear.
Best regards, Benoît
Dear Benoît Thébaudeau,
In message 1879824314.332488.1342790324727.JavaMail.root@advansee.com you wrote:
Remove spaces before opening parentheses in function calls.
Signed-off-by: Benoît Thébaudeau benoit.thebaudeau@advansee.com Cc: Wolfgang Denk wd@denx.de
Changes for v2:
- New patch for this version of the series.
.../fs/fat/fat.c | 44 ++++++++++------> ---- 1 file changed, 21 insertions(+), 23 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (3)
-
Benoît Thébaudeau -
Mike Frysinger -
Wolfgang Denk