Merge branch 'doc-col-set-data-func' of https://github.com/ferdnyc/util-linux - util-linux/util-linux.git (original) (raw)

Merge branch 'doc-col-set-data-func' of https://github.com/ferdnyc/util-linux[HEAD](/pub/scm/utils/util-linux/util-linux.git/commit/?id=c4b3ade6074d0ccb3b58187bef7b60e361bf5bfb)[master](/pub/scm/utils/util-linux/util-linux.git/log/)

* 'doc-col-set-data-func' of https://github.com/ferdnyc/util-linux: Make scols_column_set_data_func docs visible

1 files changed, 2 insertions, 2 deletions

diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c
index 8c4621c94a..e83d297fc5 100644
--- a/libsmartcols/src/column.c
+++ b/libsmartcols/src/column.c

@@ -672,7 +672,7 @@ int scols_column_get_wrap_data(const struct libscols_column *cl,

return 0;

}

-/*

+/**

* scols_column_set_data_func:

* @cl: a pointer to a struct libscols_column instance

* @datafunc: function to return data

@@ -682,7 +682,7 @@ int scols_column_get_wrap_data(const struct libscols_column *cl,

* for some internal operations (like filters or counters) it needs to convert

* the strings to usable data format. If this conversion is not possible then

* application can define datafunc() callback to provide data for filters and counters.

-

+ *

* The callback needs to return the data as pointer to void, and the data type

* is defined by scols_column_set_data_type().

*