Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 15:28:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disk: fix blk_get_device_part_str()

Browse source 
blk_get_device_part_str() should always initialize all info fields
including sys_ind. As a side effect the code is simplified.

Replace '(0 ==' by '(!' to conform with Linux coding style.

Fixes: 4d907025d6 ("sandbox: restore ability to access host fs through standard commands")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Heinrich Schuchardt 2022-11-20 11:23:24 +01:00
parent 27380d885d
commit be2e42fa95
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
disk/part.c
View file

@ -433,25 +433,17 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
int part; int part;
struct disk_partition tmpinfo; struct disk_partition tmpinfo;
*dev_desc = NULL;
memset(info, 0, sizeof(*info));
#if IS_ENABLED(CONFIG_SANDBOX) || IS_ENABLED(CONFIG_SEMIHOSTING) #if IS_ENABLED(CONFIG_SANDBOX) || IS_ENABLED(CONFIG_SEMIHOSTING)
/* /*
* Special-case a pseudo block device "hostfs", to allow access to the * Special-case a pseudo block device "hostfs", to allow access to the
* host's own filesystem. * host's own filesystem.
*/ */
if (0 == strcmp(ifname, "hostfs")) { if (!strcmp(ifname, "hostfs")) {
*dev_desc = NULL;
info->start = 0;
info->size = 0;
info->blksz = 0;
info->bootable = 0;
strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->type, BOOT_PART_TYPE);
strcpy((char *)info->name, "Host filesystem"); strcpy((char *)info->name, "Host filesystem");
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
info->uuid[0] = 0;
#endif
#ifdef CONFIG_PARTITION_TYPE_GUID
info->type_guid[0] = 0;
#endif
return 0; return 0;
} }
@ -462,19 +454,14 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
* Special-case ubi, ubi goes through a mtd, rather than through * Special-case ubi, ubi goes through a mtd, rather than through
* a regular block device. * a regular block device.
*/ */
if (0 == strcmp(ifname, "ubi")) { if (!strcmp(ifname, "ubi")) {
if (!ubifs_is_mounted()) { if (!ubifs_is_mounted()) {
printf("UBIFS not mounted, use ubifsmount to mount volume first!\n"); printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
return -EINVAL; return -EINVAL;
} }
*dev_desc = NULL;
memset(info, 0, sizeof(*info));
strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->type, BOOT_PART_TYPE);
strcpy((char *)info->name, "UBI"); strcpy((char *)info->name, "UBI");
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
info->uuid[0] = 0;
#endif
return 0; return 0;
} }
#endif #endif