diff options
| author | Karel Zak | 2013-05-02 13:39:46 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:46:54 +0200 |
| commit | aec8d8834968b472d8986e1299f3d7dda76db5ea (patch) | |
| tree | beee7027ff205894873b0c8a02299bc288f6ec0e | |
| parent | libfdisk: add fdisk_partname() (diff) | |
| download | kernel-qcow2-util-linux-aec8d8834968b472d8986e1299f3d7dda76db5ea.tar.gz kernel-qcow2-util-linux-aec8d8834968b472d8986e1299f3d7dda76db5ea.tar.xz kernel-qcow2-util-linux-aec8d8834968b472d8986e1299f3d7dda76db5ea.zip | |
fdisk: (gpt, sun) use fdisk_partname()
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | fdisks/fdisksunlabel.c | 8 | ||||
| -rw-r--r-- | libfdisk/src/gpt.c | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/fdisks/fdisksunlabel.c b/fdisks/fdisksunlabel.c index ff5a69c44..9fc06a941 100644 --- a/fdisks/fdisksunlabel.c +++ b/fdisks/fdisksunlabel.c @@ -677,7 +677,7 @@ static int sun_list_disklabel(struct fdisk_context *cxt) { struct sun_disklabel *sunlabel; struct tt *tb = NULL; - size_t i, w; + size_t i; int rc; assert(cxt); @@ -713,8 +713,6 @@ static int sun_list_disklabel(struct fdisk_context *cxt) tt_define_column(tb, _("Id"), 2, TT_FL_RIGHT); tt_define_column(tb, _("System"), 0.2, TT_FL_TRUNC); - w = strlen(cxt->dev_path); - for (i = 0 ; i < cxt->label->nparts_max; i++) { struct sun_partition *part = &sunlabel->partitions[i]; uint16_t flags = be16_to_cpu(sunlabel->vtoc.infos[i].flags); @@ -736,9 +734,9 @@ static int sun_list_disklabel(struct fdisk_context *cxt) len = be32_to_cpu(part->num_sectors); t = fdisk_get_partition_type(cxt, i); - p = partname(cxt->dev_path, i+1, w); + p = fdisk_partname(cxt->dev_path, i + 1); if (p) - tt_line_set_data(ln, 0, strdup(p)); /* devname */ + tt_line_set_data(ln, 0, p); /* devname */ if ((flags & SUN_FLAG_UNMNT || flags & SUN_FLAG_RONLY) && asprintf(&p, "%c%c", flags & SUN_FLAG_UNMNT ? 'u' : ' ', diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index 5a434e946..b9fec8194 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -1158,12 +1158,12 @@ static int gpt_list_disklabel(struct fdisk_context *cxt) if (!tb) return -ENOMEM; - tt_define_column(tb, "#", 2, TT_FL_RIGHT); - tt_define_column(tb, "Start", 12, TT_FL_RIGHT); - tt_define_column(tb, "End", 12, TT_FL_RIGHT); - tt_define_column(tb, "Size", 6, TT_FL_RIGHT); - tt_define_column(tb, "Type", 0.2, TT_FL_TRUNC); - tt_define_column(tb, "Name", 0.2, TT_FL_TRUNC); + tt_define_column(tb, _("Device"), 0.2, 0); + tt_define_column(tb, _("Start"), 12, TT_FL_RIGHT); + tt_define_column(tb, _("End"), 12, TT_FL_RIGHT); + tt_define_column(tb, _("Size"), 6, TT_FL_RIGHT); + tt_define_column(tb, _("Type"), 0.2, TT_FL_TRUNC); + tt_define_column(tb, _("Name"), 0.2, TT_FL_TRUNC); for (i = 0; i < le32_to_cpu(gpt->pheader->npartition_entries); i++) { char *name = NULL, *sizestr = NULL, *p; @@ -1187,7 +1187,8 @@ static int gpt_list_disklabel(struct fdisk_context *cxt) size * cxt->sector_size); t = fdisk_get_partition_type(cxt, i); - if (asprintf(&p, "%d", i + 1) > 0) + p = fdisk_partname(cxt->dev_path, i + 1); + if (p) tt_line_set_data(ln, 0, p); if (asprintf(&p, "%ju", start) > 0) tt_line_set_data(ln, 1, p); |