diff options
| author | Karel Zak | 2014-08-13 11:12:27 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-08-13 11:12:27 +0200 |
| commit | bd85d11fbadfbf1b60e2dcfec5e12ad929641996 (patch) | |
| tree | 53e78c6aecf1f27dab2189b165d8c8776cb1d902 /libfdisk/src/dos.c | |
| parent | libfdisk: remove dependence on libsmartcols (diff) | |
| download | kernel-qcow2-util-linux-bd85d11fbadfbf1b60e2dcfec5e12ad929641996.tar.gz kernel-qcow2-util-linux-bd85d11fbadfbf1b60e2dcfec5e12ad929641996.tar.xz kernel-qcow2-util-linux-bd85d11fbadfbf1b60e2dcfec5e12ad929641996.zip | |
libfdisk: rename fdisk_column to fdisk_field
.. to make the API and fdisk(s) code more readable.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/dos.c')
| -rw-r--r-- | libfdisk/src/dos.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c index fc4ac7a80..4805102c7 100644 --- a/libfdisk/src/dos.c +++ b/libfdisk/src/dos.c @@ -1981,23 +1981,23 @@ static int dos_toggle_partition_flag( return 0; } -static const struct fdisk_column dos_columns[] = +static const struct fdisk_field dos_fields[] = { /* basic */ - { FDISK_COL_DEVICE, N_("Device"), 10, 0 }, - { FDISK_COL_BOOT, N_("Boot"), 1, 0 }, - { FDISK_COL_START, N_("Start"), 5, FDISK_COLFL_NUMBER }, - { FDISK_COL_END, N_("End"), 5, FDISK_COLFL_NUMBER }, - { FDISK_COL_SECTORS, N_("Sectors"), 5, FDISK_COLFL_NUMBER }, - { FDISK_COL_CYLINDERS, N_("Cylinders"), 5, FDISK_COLFL_NUMBER }, - { FDISK_COL_SIZE, N_("Size"), 5, FDISK_COLFL_NUMBER | FDISK_COLFL_EYECANDY }, - { FDISK_COL_TYPEID, N_("Id"), 2, FDISK_COLFL_NUMBER }, - { FDISK_COL_TYPE, N_("Type"), 0.1, 0 }, + { FDISK_FIELD_DEVICE, N_("Device"), 10, 0 }, + { FDISK_FIELD_BOOT, N_("Boot"), 1, 0 }, + { FDISK_FIELD_START, N_("Start"), 5, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_END, N_("End"), 5, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_SECTORS, N_("Sectors"), 5, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_CYLINDERS,N_("Cylinders"), 5, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_SIZE, N_("Size"), 5, FDISK_FIELDFL_NUMBER | FDISK_FIELDFL_EYECANDY }, + { FDISK_FIELD_TYPEID, N_("Id"), 2, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_TYPE, N_("Type"), 0.1, 0 }, /* expert mode */ - { FDISK_COL_SADDR, N_("Start-C/H/S"), 1, FDISK_COLFL_NUMBER | FDISK_COLFL_DETAIL }, - { FDISK_COL_EADDR, N_("End-C/H/S"), 1, FDISK_COLFL_NUMBER | FDISK_COLFL_DETAIL }, - { FDISK_COL_ATTR, N_("Attrs"), 2, FDISK_COLFL_NUMBER | FDISK_COLFL_DETAIL } + { FDISK_FIELD_SADDR, N_("Start-C/H/S"), 1, FDISK_FIELDFL_NUMBER | FDISK_FIELDFL_DETAIL }, + { FDISK_FIELD_EADDR, N_("End-C/H/S"), 1, FDISK_FIELDFL_NUMBER | FDISK_FIELDFL_DETAIL }, + { FDISK_FIELD_ATTR, N_("Attrs"), 2, FDISK_FIELDFL_NUMBER | FDISK_FIELDFL_DETAIL } }; @@ -2048,8 +2048,8 @@ struct fdisk_label *fdisk_new_dos_label(struct fdisk_context *cxt) lb->op = &dos_operations; lb->parttypes = dos_parttypes; lb->nparttypes = ARRAY_SIZE(dos_parttypes); - lb->columns = dos_columns; - lb->ncolumns = ARRAY_SIZE(dos_columns); + lb->fields = dos_fields; + lb->nfields = ARRAY_SIZE(dos_fields); return lb; } |