From: Karel Zak <kzak@redhat.com>
Date: Mon, 18 Jan 2016 09:36:31 +0000 (+0100)
Subject: libsmartcols: be sure column is unused
X-Git-Tag: v2.28-rc1~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ad4b8503cd66ef9de97f25d374f19cb29181919;p=thirdparty%2Futil-linux.git

libsmartcols: be sure column is unused

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

diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index 3360d525bc..ca1e64825a 100644
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -126,13 +126,14 @@ int scols_table_set_name(struct libscols_table *tb, const char *name)
  * @tb: a pointer to a struct libscols_table instance
  * @cl: a pointer to a struct libscols_column instance
  *
- * Adds @cl to @tb's column list.
+ * Adds @cl to @tb's column list. The column cannot be shared between more
+ * tables.
  *
  * Returns: 0, a negative number in case of an error.
  */
 int scols_table_add_column(struct libscols_table *tb, struct libscols_column *cl)
 {
-	if (!tb || !cl || !list_empty(&tb->tb_lines))
+	if (!tb || !cl || !list_empty(&tb->tb_lines) || cl->table)
 		return -EINVAL;
 
 	if (cl->flags & SCOLS_FL_TREE)