]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'getters' of https://github.com/ignatenkobrain/util-linux
authorKarel Zak <kzak@redhat.com>
Fri, 23 Sep 2016 12:25:37 +0000 (14:25 +0200)
committerKarel Zak <kzak@redhat.com>
Fri, 23 Sep 2016 12:25:37 +0000 (14:25 +0200)
* '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()

1  2 
libsmartcols/src/libsmartcols.h.in
libsmartcols/src/libsmartcols.sym
libsmartcols/src/table.c

Simple merge
index 62698bac608a8cdef835ee65c4bdaca0795aa0cb,774d84fe095f15e4b9883022622bb6f5c77cfd1b..aca648b631a524678d74ed04202320502461eff6
@@@ -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;
index a433e42b4bc3999de6af90e2a50f4c3bbc685a7e,3b04247047225e4a4e21467d3eb50fd2bc32a5a0..759b54c27b37b27d2f9a5bb441eff30ebcdee521
@@@ -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
   *