From: Karel Zak <kzak@redhat.com>
Date: Fri, 5 May 2017 10:13:15 +0000 (+0200)
Subject: column: use libsmartcols to avoid circular dependences
X-Git-Tag: v2.30-rc1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c467fdaf8061c4a4b69a0398520a42003318e2fe;p=thirdparty%2Futil-linux.git

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 7d6a8dcb6e..4d859e013b 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);
 		}
 	}