From: Karel Zak <kzak@redhat.com>
Date: Thu, 19 Dec 2013 12:58:46 +0000 (+0100)
Subject: libfdisk: tiny clean up in fdisk_table_to_string()
X-Git-Tag: v2.25-rc1~511
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f7fdeaf0e4d26b6758c19db0ab2429def826b0d;p=thirdparty%2Futil-linux.git

libfdisk: tiny clean up in fdisk_table_to_string()

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

diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c
index c934910a1f..44580146fe 100644
--- a/libfdisk/src/table.c
+++ b/libfdisk/src/table.c
@@ -340,19 +340,12 @@ int fdisk_table_to_string(struct fdisk_table *tb,
 
 		/* set data for the columns */
 		for (j = 0; j < ncols; j++) {
-			const struct fdisk_column *col;
 			char *cdata = NULL;
-			int id;
 
 			col = fdisk_label_get_column(cxt->label, cols[j]);
 			if (!col)
 				continue;
-			id = (col->id == FDISK_COL_SECTORS &&
-			      fdisk_context_use_cylinders(cxt)) ?
-					FDISK_COL_CYLINDERS :
-					col->id;
-
-			if (fdisk_partition_to_string(pa, cxt, id, &cdata))
+			if (fdisk_partition_to_string(pa, cxt, col->id, &cdata))
 				continue;
 			tt_line_set_data(ln, j, cdata);
 		}