From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 May 2013 11:39:46 +0000 (+0200)
Subject: fdisk: (gpt, sun) use fdisk_partname()
X-Git-Tag: v2.24-rc1~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aec8d8834968b472d8986e1299f3d7dda76db5ea;p=thirdparty%2Futil-linux.git

fdisk: (gpt, sun) use fdisk_partname()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/fdisksunlabel.c b/fdisks/fdisksunlabel.c
index ff5a69c441..9fc06a941f 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 5a434e9465..b9fec81943 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);