From: Karel Zak <kzak@redhat.com>
Date: Fri, 23 Sep 2016 12:25:37 +0000 (+0200)
Subject: Merge branch 'getters' of https://github.com/ignatenkobrain/util-linux
X-Git-Tag: v2.29-rc1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3b91e82f269f4663d36b7878d0c430621415080;p=thirdparty%2Futil-linux.git

Merge branch 'getters' of https://github.com/ignatenkobrain/util-linux

* 'getters' of https://github.com/ignatenkobrain/util-linux:
  libsmartcols: add scols_table_is_nolinesep()
  libsmartcols: add scols_table_is_nowrap()
  libsmartcols: add scols_table_get_name()
---

a3b91e82f269f4663d36b7878d0c430621415080
diff --cc libsmartcols/src/libsmartcols.sym
index 62698bac60,774d84fe09..aca648b631
--- a/libsmartcols/src/libsmartcols.sym
+++ b/libsmartcols/src/libsmartcols.sym
@@@ -141,10 -141,11 +141,13 @@@ SMARTCOLS_2.29 
  global:
  	scols_column_is_wrapnl;
  	scols_symbols_set_cell_padding;
 +	scols_table_get_symbols;
  	scols_table_get_termforce;
  	scols_table_get_termwidth;
 +	scols_table_set_default_symbols;
  	scols_table_set_termforce;
  	scols_table_set_termwidth;
+ 	scols_table_get_name;
+ 	scols_table_is_nowrap;
+ 	scols_table_is_nolinesep;
  } SMARTCOLS_2.28;
diff --cc libsmartcols/src/table.c
index a433e42b4b,3b04247047..759b54c27b
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@@ -748,19 -727,9 +761,19 @@@ int scols_table_set_symbols(struct libs
  	return 0;
  }
  
 +/**
 + * scols_table_get_symbols:
 + * @tb: table
 + *
 + * Returns: pointer to symbols table.
 + */
 +struct libscols_symbols *scols_table_get_symbols(const struct libscols_table *tb)
 +{
 +	return tb->symbols;
 +}
 +
  /**
-  * scols_table_enable_nolinesep
+  * scols_table_enable_nolinesep:
   * @tb: table
   * @enable: 1 or 0
   *