minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 22:16:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Partition support: remove newline from partition name

Browse Source 
Remove bogus newline character that got added to the .name field of
the disk_partition_t structure.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2009-07-28 22:35:39 +02:00
parent 3f1649fb0d
commit 716655288a
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
disk/part_dos.c
View File

@ -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_IDE:
case IF_TYPE_SATA: case IF_TYPE_SATA:
case IF_TYPE_ATAPI: 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; break;
case IF_TYPE_SCSI: 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; break;
case IF_TYPE_USB: 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; break;
case IF_TYPE_DOC: 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; break;
default: 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; break;
} }
/* sprintf(info->type, "%d, pt->sys_ind); */ /* sprintf(info->type, "%d, pt->sys_ind); */

2
disk/part_efi.c
View File

@ -169,7 +169,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
- info->start; - info->start;
info->blksz = GPT_BLOCK_SIZE; 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"); sprintf((char *)info->type, "U-Boot");
debug("%s: start 0x%lX, size 0x%lX, name %s", __FUNCTION__, debug("%s: start 0x%lX, size 0x%lX, name %s", __FUNCTION__,

15
disk/part_iso.c
View File

@ -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_IDE:
case IF_TYPE_SATA: case IF_TYPE_SATA:
case IF_TYPE_ATAPI: 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; break;
case IF_TYPE_SCSI: 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; break;
case IF_TYPE_USB: 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; break;
case IF_TYPE_DOC: 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; break;
default: 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; break;
} }
/* the bootcatalog (including validation Entry) is limited to 2048Bytes /* the bootcatalog (including validation Entry) is limited to 2048Bytes