libfdisk: clean up cylinder column
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
9f670072f4
commit
d0059a2491
|
@ -877,9 +877,11 @@ static const struct fdisk_label_operations bsd_operations =
|
||||||
static const struct fdisk_column bsd_columns[] =
|
static const struct fdisk_column bsd_columns[] =
|
||||||
{
|
{
|
||||||
{ FDISK_COL_DEVICE, N_("Slice"), 1, 0 },
|
{ FDISK_COL_DEVICE, N_("Slice"), 1, 0 },
|
||||||
{ FDISK_COL_START, N_("Start"), 9, TT_FL_RIGHT },
|
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_END, N_("End"), 9, TT_FL_RIGHT },
|
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SIZE, N_("Size"), 9, TT_FL_RIGHT },
|
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT },
|
||||||
|
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
||||||
|
{ FDISK_COL_CYLINDERS, N_("Cylinders"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_TYPE, N_("Type"), 8, 0 },
|
{ FDISK_COL_TYPE, N_("Type"), 8, 0 },
|
||||||
{ FDISK_COL_FSIZE, N_("Fsize"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_FSIZE, N_("Fsize"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_BSIZE, N_("Bsize"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_BSIZE, N_("Bsize"), 5, TT_FL_RIGHT },
|
||||||
|
|
|
@ -1836,6 +1836,7 @@ static const struct fdisk_column dos_columns[] =
|
||||||
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
||||||
|
{ FDISK_COL_CYLINDERS, N_("Cylinders"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT, FDISK_COLFL_EYECANDY },
|
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT, FDISK_COLFL_EYECANDY },
|
||||||
{ FDISK_COL_TYPEID, N_("Id"), 2, TT_FL_RIGHT },
|
{ FDISK_COL_TYPEID, N_("Id"), 2, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC },
|
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC },
|
||||||
|
|
|
@ -2269,6 +2269,7 @@ static const struct fdisk_column gpt_columns[] =
|
||||||
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
||||||
|
{ FDISK_COL_CYLINDERS, N_("Cylinders"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT, FDISK_COLFL_EYECANDY },
|
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT, FDISK_COLFL_EYECANDY },
|
||||||
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC, FDISK_COLFL_EYECANDY },
|
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC, FDISK_COLFL_EYECANDY },
|
||||||
/* expert */
|
/* expert */
|
||||||
|
|
|
@ -137,13 +137,20 @@ int fdisk_get_columns(struct fdisk_context *cxt, int all, int **cols, size_t *nc
|
||||||
if (!c)
|
if (!c)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
for (n = 0, i = 0; i < cxt->label->ncolumns; i++) {
|
for (n = 0, i = 0; i < cxt->label->ncolumns; i++) {
|
||||||
|
int id = cxt->label->columns[i].id;
|
||||||
|
|
||||||
if (!all &&
|
if (!all &&
|
||||||
((fdisk_context_display_details(cxt) &&
|
((fdisk_context_display_details(cxt) &&
|
||||||
(cxt->label->columns[i].flags & FDISK_COLFL_EYECANDY))
|
(cxt->label->columns[i].flags & FDISK_COLFL_EYECANDY))
|
||||||
|| (!fdisk_context_display_details(cxt) &&
|
|| (!fdisk_context_display_details(cxt) &&
|
||||||
(cxt->label->columns[i].flags & FDISK_COLFL_DETAIL))))
|
(cxt->label->columns[i].flags & FDISK_COLFL_DETAIL))
|
||||||
|
|| (id == FDISK_COL_SECTORS &&
|
||||||
|
fdisk_context_use_cylinders(cxt))
|
||||||
|
|| (id == FDISK_COL_CYLINDERS &&
|
||||||
|
!fdisk_context_use_cylinders(cxt))))
|
||||||
continue;
|
continue;
|
||||||
c[n++] = cxt->label->columns[i].id;
|
|
||||||
|
c[n++] = id;
|
||||||
}
|
}
|
||||||
if (cols)
|
if (cols)
|
||||||
*cols = c;
|
*cols = c;
|
||||||
|
|
|
@ -1121,6 +1121,7 @@ static const struct fdisk_column sgi_columns[] =
|
||||||
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
||||||
|
{ FDISK_COL_CYLINDERS, N_("Cylinders"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT, FDISK_COLFL_EYECANDY },
|
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT, FDISK_COLFL_EYECANDY },
|
||||||
{ FDISK_COL_TYPEID, N_("Id"), 2, TT_FL_RIGHT },
|
{ FDISK_COL_TYPEID, N_("Id"), 2, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC, FDISK_COLFL_EYECANDY },
|
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC, FDISK_COLFL_EYECANDY },
|
||||||
|
|
|
@ -988,6 +988,7 @@ static const struct fdisk_column sun_columns[] =
|
||||||
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
|
||||||
|
{ FDISK_COL_CYLINDERS, N_("Cylinders"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT },
|
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_TYPEID, N_("Id"), 2, TT_FL_RIGHT },
|
{ FDISK_COL_TYPEID, N_("Id"), 2, TT_FL_RIGHT },
|
||||||
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC },
|
{ FDISK_COL_TYPE, N_("Type"), 0.1, TT_FL_TRUNC },
|
||||||
|
|
|
@ -322,13 +322,8 @@ int fdisk_table_to_string(struct fdisk_table *tb,
|
||||||
/* define columns */
|
/* define columns */
|
||||||
for (j = 0; j < ncols; j++) {
|
for (j = 0; j < ncols; j++) {
|
||||||
col = fdisk_label_get_column(cxt->label, cols[j]);
|
col = fdisk_label_get_column(cxt->label, cols[j]);
|
||||||
if (!col)
|
if (col)
|
||||||
continue;
|
tt_define_column(tt, col->name, col->width, col->tt_flags);
|
||||||
tt_define_column(tt,
|
|
||||||
col->id == FDISK_COL_SECTORS &&
|
|
||||||
fdisk_context_use_cylinders(cxt) ?
|
|
||||||
_("Cylinders") : col->name,
|
|
||||||
col->width, col->tt_flags);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fdisk_reset_iter(&itr, FDISK_ITER_FORWARD);
|
fdisk_reset_iter(&itr, FDISK_ITER_FORWARD);
|
||||||
|
|
Loading…
Reference in New Issue