summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/bsd.c
diff options
context:
space:
mode:
authorKarel Zak2014-04-01 14:39:13 +0200
committerKarel Zak2014-04-01 14:39:13 +0200
commit412791a995890d3576906d86a39bbee6246eb01e (patch)
treed176100c5c21a7a5a176806347b16d15abb99453 /libfdisk/src/bsd.c
parentdmesg: don't use brow/yellow in output (diff)
downloadkernel-qcow2-util-linux-412791a995890d3576906d86a39bbee6246eb01e.tar.gz
kernel-qcow2-util-linux-412791a995890d3576906d86a39bbee6246eb01e.tar.xz
kernel-qcow2-util-linux-412791a995890d3576906d86a39bbee6246eb01e.zip
libfdisk: remove fdisk_colon()
It was unnecessary overkill to have colorized "foo:" prefix in fdisk output. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/bsd.c')
-rw-r--r--libfdisk/src/bsd.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index 3a4b0e4b6..4ece79fb2 100644
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -366,37 +366,37 @@ static int bsd_list_disklabel(struct fdisk_context *cxt)
assert(fdisk_is_disklabel(cxt, BSD));
if (fdisk_context_display_details(cxt)) {
- fdisk_colon(cxt, "# %s:", cxt->dev_path);
+ fdisk_info(cxt, "# %s:", cxt->dev_path);
if ((unsigned) d->d_type < BSD_DKMAXTYPES)
- fdisk_colon(cxt, _("type: %s"), bsd_dktypenames[d->d_type]);
+ fdisk_info(cxt, _("type: %s"), bsd_dktypenames[d->d_type]);
else
- fdisk_colon(cxt, _("type: %d"), d->d_type);
+ fdisk_info(cxt, _("type: %d"), d->d_type);
- fdisk_colon(cxt, _("disk: %.*s"), (int) sizeof(d->d_typename), d->d_typename);
- fdisk_colon(cxt, _("label: %.*s"), (int) sizeof(d->d_packname), d->d_packname);
+ fdisk_info(cxt, _("disk: %.*s"), (int) sizeof(d->d_typename), d->d_typename);
+ fdisk_info(cxt, _("label: %.*s"), (int) sizeof(d->d_packname), d->d_packname);
- fdisk_colon(cxt, _("flags: %s"),
+ fdisk_info(cxt, _("flags: %s"),
d->d_flags & BSD_D_REMOVABLE ? _(" removable") :
d->d_flags & BSD_D_ECC ? _(" ecc") :
d->d_flags & BSD_D_BADSECT ? _(" badsect") : "");
/* On various machines the fields of *lp are short/int/long */
/* In order to avoid problems, we cast them all to long. */
- fdisk_colon(cxt, _("bytes/sector: %ld"), (long) d->d_secsize);
- fdisk_colon(cxt, _("sectors/track: %ld"), (long) d->d_nsectors);
- fdisk_colon(cxt, _("tracks/cylinder: %ld"), (long) d->d_ntracks);
- fdisk_colon(cxt, _("sectors/cylinder: %ld"), (long) d->d_secpercyl);
- fdisk_colon(cxt, _("cylinders: %ld"), (long) d->d_ncylinders);
- fdisk_colon(cxt, _("rpm: %d"), d->d_rpm);
- fdisk_colon(cxt, _("interleave: %d"), d->d_interleave);
- fdisk_colon(cxt, _("trackskew: %d"), d->d_trackskew);
- fdisk_colon(cxt, _("cylinderskew: %d"), d->d_cylskew);
- fdisk_colon(cxt, _("headswitch: %ld (milliseconds)"), (long) d->d_headswitch);
- fdisk_colon(cxt, _("track-to-track seek: %ld (milliseconds)"), (long) d->d_trkseek);
+ fdisk_info(cxt, _("bytes/sector: %ld"), (long) d->d_secsize);
+ fdisk_info(cxt, _("sectors/track: %ld"), (long) d->d_nsectors);
+ fdisk_info(cxt, _("tracks/cylinder: %ld"), (long) d->d_ntracks);
+ fdisk_info(cxt, _("sectors/cylinder: %ld"), (long) d->d_secpercyl);
+ fdisk_info(cxt, _("cylinders: %ld"), (long) d->d_ncylinders);
+ fdisk_info(cxt, _("rpm: %d"), d->d_rpm);
+ fdisk_info(cxt, _("interleave: %d"), d->d_interleave);
+ fdisk_info(cxt, _("trackskew: %d"), d->d_trackskew);
+ fdisk_info(cxt, _("cylinderskew: %d"), d->d_cylskew);
+ fdisk_info(cxt, _("headswitch: %ld (milliseconds)"), (long) d->d_headswitch);
+ fdisk_info(cxt, _("track-to-track seek: %ld (milliseconds)"), (long) d->d_trkseek);
}
- fdisk_colon(cxt, _("partitions: %d"), d->d_npartitions);
+ fdisk_info(cxt, _("partitions: %d"), d->d_npartitions);
return 0;
}