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/bsd.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/bsd.c')
| -rw-r--r-- | libfdisk/src/bsd.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c index d6dc4b7f9..e00cec5fd 100644 --- a/libfdisk/src/bsd.c +++ b/libfdisk/src/bsd.c @@ -878,18 +878,18 @@ static const struct fdisk_label_operations bsd_operations = .part_is_used = bsd_partition_is_used, }; -static const struct fdisk_column bsd_columns[] = +static const struct fdisk_field bsd_fields[] = { - { FDISK_COL_DEVICE, N_("Slice"), 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_COL_TYPE, N_("Type"), 8, 0 }, - { FDISK_COL_FSIZE, N_("Fsize"), 5, FDISK_COLFL_NUMBER }, - { FDISK_COL_BSIZE, N_("Bsize"), 5, FDISK_COLFL_NUMBER }, - { FDISK_COL_CPG, N_("Cpg"), 5, FDISK_COLFL_NUMBER } + { FDISK_FIELD_DEVICE, N_("Slice"), 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_FIELD_TYPE, N_("Type"), 8, 0 }, + { FDISK_FIELD_FSIZE, N_("Fsize"), 5, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_BSIZE, N_("Bsize"), 5, FDISK_FIELDFL_NUMBER }, + { FDISK_FIELD_CPG, N_("Cpg"), 5, FDISK_FIELDFL_NUMBER } }; /* @@ -914,8 +914,8 @@ struct fdisk_label *fdisk_new_bsd_label(struct fdisk_context *cxt) lb->parttypes = bsd_fstypes; lb->nparttypes = ARRAY_SIZE(bsd_fstypes); - lb->columns = bsd_columns; - lb->ncolumns = ARRAY_SIZE(bsd_columns); + lb->fields = bsd_fields; + lb->nfields = ARRAY_SIZE(bsd_fields); lb->flags |= FDISK_LABEL_FL_INCHARS_PARTNO; lb->flags |= FDISK_LABEL_FL_REQUIRE_GEOMETRY; |