Commit 71665528 authored by Wolfgang Denk's avatar Wolfgang Denk

Partition support: remove newline from partition name

Remove bogus newline character that got added to the .name field of
the disk_partition_t structure.
Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 3f1649fb
......@@ -198,19 +198,24 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part
case IF_TYPE_IDE:
case IF_TYPE_SATA:
case IF_TYPE_ATAPI:
sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "hd%c%d",
'a' + dev_desc->dev, part_num);
break;
case IF_TYPE_SCSI:
sprintf ((char *)info->name, "sd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "sd%c%d",
'a' + dev_desc->dev, part_num);
break;
case IF_TYPE_USB:
sprintf ((char *)info->name, "usbd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "usbd%c%d",
'a' + dev_desc->dev, part_num);
break;
case IF_TYPE_DOC:
sprintf ((char *)info->name, "docd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "docd%c%d",
'a' + dev_desc->dev, part_num);
break;
default:
sprintf ((char *)info->name, "xx%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "xx%c%d",
'a' + dev_desc->dev, part_num);
break;
}
/* sprintf(info->type, "%d, pt->sys_ind); */
......
......@@ -169,7 +169,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
- info->start;
info->blksz = GPT_BLOCK_SIZE;
sprintf((char *)info->name, "%s%d\n", GPT_ENTRY_NAME, part);
sprintf((char *)info->name, "%s%d", GPT_ENTRY_NAME, part);
sprintf((char *)info->type, "U-Boot");
debug("%s: start 0x%lX, size 0x%lX, name %s", __FUNCTION__,
......
......@@ -161,19 +161,24 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
case IF_TYPE_IDE:
case IF_TYPE_SATA:
case IF_TYPE_ATAPI:
sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "hd%c%d",
'a' + dev_desc->dev, part_num);
break;
case IF_TYPE_SCSI:
sprintf ((char *)info->name, "sd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "sd%c%d",
'a' + dev_desc->dev, part_num);
break;
case IF_TYPE_USB:
sprintf ((char *)info->name, "usbd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "usbd%c%d",
'a' + dev_desc->dev, part_num);
break;
case IF_TYPE_DOC:
sprintf ((char *)info->name, "docd%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "docd%c%d",
'a' + dev_desc->dev, part_num);
break;
default:
sprintf ((char *)info->name, "xx%c%d\n", 'a' + dev_desc->dev, part_num);
sprintf ((char *)info->name, "xx%c%d",
'a' + dev_desc->dev, part_num);
break;
}
/* the bootcatalog (including validation Entry) is limited to 2048Bytes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment