column: use libsmartcols to avoid circular dependences

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/column.c b/text-utils/column.c
index 7d6a8dcb6e172f511d252fec03ab5df037f47e8d..4d859e013b4b4a925479ca8688d3b048b908ad25 100644 (file)
--- 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);
                }
        }