diff options
author | Karel Zak | 2016-01-25 15:31:24 +0100 |
---|---|---|
committer | Karel Zak | 2016-01-25 15:31:24 +0100 |
commit | e85c8c98e6e3c0548c5a0d3f614f45dc04e4ebbb (patch) | |
tree | f3259f29ce01b1c1b91c8549cd46f875a120bd5d /libsmartcols | |
parent | libsmartcols: reduce also SCOLS_FL_WRAP columns (diff) | |
download | kernel-qcow2-util-linux-e85c8c98e6e3c0548c5a0d3f614f45dc04e4ebbb.tar.gz kernel-qcow2-util-linux-e85c8c98e6e3c0548c5a0d3f614f45dc04e4ebbb.tar.xz kernel-qcow2-util-linux-e85c8c98e6e3c0548c5a0d3f614f45dc04e4ebbb.zip |
libsmartcols: make SCOLS_FL_WRAP usable in tree
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libsmartcols')
-rw-r--r-- | libsmartcols/samples/wrap.c | 24 | ||||
-rw-r--r-- | libsmartcols/src/table_print.c | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/libsmartcols/samples/wrap.c b/libsmartcols/samples/wrap.c index 3a63a47a2..d24763ef0 100644 --- a/libsmartcols/samples/wrap.c +++ b/libsmartcols/samples/wrap.c @@ -26,7 +26,7 @@ enum { COL_NAME, COL_DATA }; /* add columns to the @tb */ static void setup_columns(struct libscols_table *tb) { - if (!scols_table_new_column(tb, "NAME", 0, 0)) + if (!scols_table_new_column(tb, "NAME", 0, SCOLS_FL_TREE)) goto fail; if (!scols_table_new_column(tb, "DATA", 0, SCOLS_FL_WRAP)) goto fail; @@ -36,9 +36,12 @@ fail: err(EXIT_FAILURE, "faild to create output columns"); } -static void add_line(struct libscols_table *tb, const char *name, const char *data) +static struct libscols_line * add_line( struct libscols_table *tb, + struct libscols_line *parent, + const char *name, + const char *data) { - struct libscols_line *ln = scols_table_new_line(tb, NULL); + struct libscols_line *ln = scols_table_new_line(tb, parent); if (!ln) err(EXIT_FAILURE, "failed to create output line"); @@ -46,7 +49,7 @@ static void add_line(struct libscols_table *tb, const char *name, const char *da goto fail; if (scols_line_set_data(ln, COL_DATA, data)) goto fail; - return; + return ln; fail: scols_unref_table(tb); err(EXIT_FAILURE, "faild to create output line"); @@ -55,6 +58,7 @@ fail: int main(int argc, char *argv[]) { struct libscols_table *tb; + struct libscols_line *ln; setlocale(LC_ALL, ""); /* just to have enable UTF8 chars */ @@ -67,11 +71,13 @@ int main(int argc, char *argv[]) scols_table_enable_colors(tb, 1); setup_columns(tb); - add_line(tb, "keelboat", "riverine cargo-capable working boat, or a small to mid-sized recreational sailing yacht."); - add_line(tb, "dinghy", "type of small boat, often carried or towed for use as a ship's boat by a larger vessel."); - add_line(tb, "monohull", "type of boat having only one hull, unlike multihulled boats which can have two or more individual hulls connected to one another."); - add_line(tb, "catamaran", "geometry-stabilized craft; that is, it derives its stability from its wide beam, rather than from a ballasted keel, like a monohull."); - add_line(tb, "trimaran ", "multihull boat that comprises a main hull and two smaller outrigger hulls (or \"floats\") which are attached to the main hull with lateral beams."); + ln = add_line(tb, NULL, "monohull", "type of boat having only one hull, unlike multihulled boats which can have two or more individual hulls connected to one another."); + add_line(tb, ln, "keelboat", "riverine cargo-capable working boat, or a small to mid-sized recreational sailing yacht."); + add_line(tb, ln, "dinghy", "type of small boat, often carried or towed for use as a ship's boat by a larger vessel."); + + ln = add_line(tb, NULL, "multihull", "ship, vessel, craft or boat with more than one hull."); + add_line(tb, ln, "catamaran", "geometry-stabilized craft; that is, it derives its stability from its wide beam, rather than from a ballasted keel, like a monohull."); + add_line(tb, ln, "trimaran ", "multihull boat that comprises a main hull and two smaller outrigger hulls (or \"floats\") which are attached to the main hull with lateral beams."); scols_print_table(tb); scols_unref_table(tb); diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 3a8db7f87..b003ed6d5 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -375,7 +375,7 @@ static int print_data(struct libscols_table *tb, if (*p) for (size_t j = 0; j < cl->seqnum; j++) print_empty_cell (tb, scols_table_get_column(tb, j), - NULL, buf->bufsz); + ln, buf->bufsz); } if (color) |