Re: [U-Boot] [PATCH 11/56] fs/fat/fat.c: Fix GCC 4.6 build warning

[Wolfgang Denk]

Dear Wolfgang Denk,

In message <1320458160-23136-12-git-send-email...@denx.de> you wrote:
> Fix:
> fat.c: In function 'fat_register_device':
> fat.c:74:19: warning: variable 'info' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk 
> ---
>  fs/fat/fat.c |   35 +++
>  1 files changed, 19 insertions(+), 16 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: w...@denx.de
"A dirty mind is a joy forever."   - Randy Kunkee
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 11/56] fs/fat/fat.c: Fix GCC 4.6 build warning

[Wolfgang Denk]

Fix:
fat.c: In function 'fat_register_device':
fat.c:74:19: warning: variable 'info' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk 
---
 fs/fat/fat.c |   35 +++
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 28baa54..9a29458 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -71,7 +71,6 @@ static int disk_read (__u32 startblock, __u32 getsize, __u8 * 
bufptr)
 int fat_register_device (block_dev_desc_t * dev_desc, int part_no)
 {
unsigned char buffer[dev_desc->blksz];
-   disk_partition_t info;
 
if (!dev_desc->block_read)
return -1;
@@ -95,28 +94,32 @@ int fat_register_device (block_dev_desc_t * dev_desc, int 
part_no)
  defined(CONFIG_CMD_USB) || \
  defined(CONFIG_MMC) || \
  defined(CONFIG_SYSTEMACE) )
-   /* First we assume there is a MBR */
-   if (!get_partition_info(dev_desc, part_no, &info)) {
-   part_offset = info.start;
-   cur_part = part_no;
-   } else if ((strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET], "FAT", 3) == 
0) ||
-  (strncmp((char *)&buffer[DOS_FS32_TYPE_OFFSET], "FAT32", 5) 
== 0)) {
-   /* ok, we assume we are on a PBR only */
-   cur_part = 1;
-   part_offset = 0;
-   } else {
-   printf("** Partition %d not valid on device %d **\n",
-   part_no, dev_desc->dev);
-   return -1;
+   {
+   disk_partition_t info;
+
+   /* First we assume there is a MBR */
+   if (!get_partition_info(dev_desc, part_no, &info)) {
+   part_offset = info.start;
+   cur_part = part_no;
+   } else if ((strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],
+   "FAT", 3) == 0) ||
+  (strncmp((char *)&buffer[DOS_FS32_TYPE_OFFSET],
+   "FAT32", 5) == 0)) {
+   /* ok, we assume we are on a PBR only */
+   cur_part = 1;
+   part_offset = 0;
+   } else {
+   printf("** Partition %d not valid on device %d **\n",
+   part_no, dev_desc->dev);
+   return -1;
+   }
}
-
 #else
if ((strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET], "FAT", 3) == 0) ||
(strncmp((char *)&buffer[DOS_FS32_TYPE_OFFSET], "FAT32", 5) == 0)) {
/* ok, we assume we are on a PBR only */
cur_part = 1;
part_offset = 0;
-   info.start = part_offset;
} else {
/* FIXME we need to determine the start block of the
 * partition where the DOS FS resides. This can be done
-- 
1.7.6.4

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot