Fix GCC format-security errors and convert sprintfs.
With format-security errors turned on, GCC picks up the use of sprintf with a format parameter not being a string literal. Simple uses of sprintf are also converted to use strcpy. Signed-off-by: Ben Whitten <ben.whitten@gmail.com> Acked-by: Wolfgang Denk <wd@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -237,7 +237,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc,
|
||||
break;
|
||||
}
|
||||
/* sprintf(info->type, "%d, pt->sys_ind); */
|
||||
sprintf ((char *)info->type, "U-Boot");
|
||||
strcpy((char *)info->type, "U-Boot");
|
||||
info->bootable = is_bootable(pt);
|
||||
#ifdef CONFIG_PARTITION_UUIDS
|
||||
sprintf(info->uuid, "%08x-%02x", disksig, part_num);
|
||||
@@ -273,7 +273,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc,
|
||||
info->size = dev_desc->lba;
|
||||
info->blksz = DOS_PART_DEFAULT_SECTOR;
|
||||
info->bootable = 0;
|
||||
sprintf ((char *)info->type, "U-Boot");
|
||||
strcpy((char *)info->type, "U-Boot");
|
||||
#ifdef CONFIG_PARTITION_UUIDS
|
||||
info->uuid[0] = 0;
|
||||
#endif
|
||||
|
||||
@@ -281,7 +281,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
|
||||
|
||||
sprintf((char *)info->name, "%s",
|
||||
print_efiname(&gpt_pte[part - 1]));
|
||||
sprintf((char *)info->type, "U-Boot");
|
||||
strcpy((char *)info->type, "U-Boot");
|
||||
info->bootable = is_bootable(&gpt_pte[part - 1]);
|
||||
#ifdef CONFIG_PARTITION_UUIDS
|
||||
uuid_bin_to_str(gpt_pte[part - 1].unique_partition_guid.b, info->uuid,
|
||||
|
||||
@@ -137,7 +137,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
|
||||
/* the validation entry seems to be ok, now search the "partition" */
|
||||
entry_num=0;
|
||||
offset=0x20;
|
||||
sprintf ((char *)info->type, "U-Boot");
|
||||
strcpy((char *)info->type, "U-Boot");
|
||||
switch(dev_desc->if_type) {
|
||||
case IF_TYPE_IDE:
|
||||
case IF_TYPE_SATA:
|
||||
|
||||
Reference in New Issue
Block a user