]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libfdisk: tiny clean up in fdisk_table_to_string()
authorKarel Zak <kzak@redhat.com>
Thu, 19 Dec 2013 12:58:46 +0000 (13:58 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 11 Mar 2014 10:35:13 +0000 (11:35 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
libfdisk/src/table.c

index c934910a1f6aa0217cb277c16a6c22009dec263c..44580146feb2340532d9717744bba38294e924d8 100644 (file)
@@ -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);
                }