From a1687b858e5670683199f6923b32aec0ea82ba19 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 17 Oct 2012 06:44:58 +0000 Subject: [PATCH] FAT: initialize all fields in cur_part_info, simplify init MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit cur_part_info.{name,type} are strings. So, we don't need to memset() the entire thing, just put the NULL-termination in the first byte. Add missing initialization of the bootable and uuid fields. None of these fields are actually used by fat.c. However, since it stores the entire disk_partition_t, we should make sure that all fields are valid. Signed-off-by: Stephen Warren Reviewed-by: Benoît Thébaudeau --- fs/fat/fat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 731d3690c3..31042e5357 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -92,8 +92,12 @@ int fat_register_device(block_dev_desc_t * dev_desc, int part_no) cur_part_info.start = 0; cur_part_info.size = dev_desc->lba; cur_part_info.blksz = dev_desc->blksz; - memset(cur_part_info.name, 0, sizeof(cur_part_info.name)); - memset(cur_part_info.type, 0, sizeof(cur_part_info.type)); + cur_part_info.name[0] = 0; + cur_part_info.type[0] = 0; + cur_part_info.bootable = 0; +#ifdef CONFIG_PARTITION_UUIDS + cur_part_info.uuid[0] = 0; +#endif } /* Make sure it has a valid FAT header */ -- 2.30.2