From: Karel Zak <kzak@redhat.com>
Date: Thu, 22 Sep 2016 11:47:23 +0000 (+0200)
Subject: libsmartcols: keep scols_table_get_termwidth() read-only
X-Git-Tag: v2.29-rc1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02aaba6f9f4e20bd259655694eee58a435dae769;p=thirdparty%2Futil-linux.git

libsmartcols: keep scols_table_get_termwidth() read-only

Addresses: https://github.com/karelzak/util-linux/issues/356
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index 9aae75c958..4040b43654 100644
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -68,6 +68,7 @@ struct libscols_table *scols_new_table(void)
 
 	tb->refcount = 1;
 	tb->out = stdout;
+	tb->termwidth = get_terminal_width(80);
 
 	INIT_LIST_HEAD(&tb->tb_lines);
 	INIT_LIST_HEAD(&tb->tb_columns);
@@ -1154,7 +1155,5 @@ int scols_table_set_termwidth(struct libscols_table *tb, size_t width)
  */
 size_t scols_table_get_termwidth(struct libscols_table *tb)
 {
-	if (tb->termwidth == 0)
-		tb->termwidth = get_terminal_width(80);
 	return tb->termwidth;
 }