diff options
| author | Karel Zak | 2014-04-03 16:09:57 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-04-03 16:09:57 +0200 |
| commit | 0925a9dd6cd65feb8cb2d4d66551363f4af161e9 (patch) | |
| tree | 9981e45aee1274f959a9b32f3cbdffabc8a45d8c /misc-utils/lsblk.c | |
| parent | fdisk: print table header as bold (diff) | |
| download | kernel-qcow2-util-linux-0925a9dd6cd65feb8cb2d4d66551363f4af161e9.tar.gz kernel-qcow2-util-linux-0925a9dd6cd65feb8cb2d4d66551363f4af161e9.tar.xz kernel-qcow2-util-linux-0925a9dd6cd65feb8cb2d4d66551363f4af161e9.zip | |
libsmartcols: clean up flags usage
* rename flags functions to scols_table_enable_*
* rename *_no_foo() functions to _nofoo()
* output formats are mutually exclusive, so don't use flags there
* don't assume symbols in scols_new_table(), use scols_table_set_symbols()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/lsblk.c')
| -rw-r--r-- | misc-utils/lsblk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index bea04af0a..2efb2ecfb 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -1558,12 +1558,12 @@ int main(int argc, char *argv[]) /* * initialize output columns */ - if (!(lsblk->table = scols_new_table(NULL))) + if (!(lsblk->table = scols_new_table())) errx(EXIT_FAILURE, _("failed to initialize output table")); - scols_table_set_raw(lsblk->table, !!(scols_flags & LSBLK_RAW)); - scols_table_set_export(lsblk->table, !!(scols_flags & LSBLK_EXPORT)); - scols_table_set_ascii(lsblk->table, !!(scols_flags & LSBLK_ASCII)); - scols_table_set_no_headings(lsblk->table, !!(scols_flags & LSBLK_NOHEADINGS)); + scols_table_enable_raw(lsblk->table, !!(scols_flags & LSBLK_RAW)); + scols_table_enable_export(lsblk->table, !!(scols_flags & LSBLK_EXPORT)); + scols_table_enable_ascii(lsblk->table, !!(scols_flags & LSBLK_ASCII)); + scols_table_enable_noheadings(lsblk->table, !!(scols_flags & LSBLK_NOHEADINGS)); for (i = 0; i < ncolumns; i++) { struct colinfo *ci = get_column_info(i); |