From c467fdaf8061c4a4b69a0398520a42003318e2fe Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 5 May 2017 12:13:15 +0200 Subject: column: use libsmartcols to avoid circular dependences Signed-off-by: Karel Zak --- text-utils/column.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'text-utils/column.c') diff --git a/text-utils/column.c b/text-utils/column.c index 7d6a8dcb6..4d859e013 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -329,12 +329,11 @@ static void create_tree(struct column_control *ctl) if (!parent) continue; - if (scols_line_get_parent(ln_i) == ln) + if (strcmp(id, parent) != 0) continue; - if ( ln_i == ln) + if (scols_line_is_ancestor(ln, ln_i)) continue; - if (strcmp(id, parent) == 0) - scols_line_add_child(ln_i, ln); + scols_line_add_child(ln_i, ln); } } -- cgit v1.2.3-55-g7522