From: Robert Kessl Date: Thu, 24 Jul 2014 08:26:37 +0000 (+0200) Subject: tableprinter&xtypes: update of ABI X-Git-Tag: v6.1~3^2~51 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ee432953f4c0d261d7e4c9fea069c7feeabea0c1;p=libucw.git tableprinter&xtypes: update of ABI --- diff --git a/maint/libucw.abi b/maint/libucw.abi index 21141179..d0442263 100644 --- a/maint/libucw.abi +++ b/maint/libucw.abi @@ -501,62 +501,45 @@ str_to_uint str_to_uns str_to_u32 str_to_u64 +# ucw/table-types.h +table_col_size +table_col_timestamp +xt_size +xt_timestamp # ucw/table.h table_init table_cleanup table_start table_end -table_set_col_order -table_set_col_order_by_name -table_end_row +table_col_str +table_col_generic_format table_col_printf -table_append_printf -table_get_col_idx -table_get_col_list table_col_fbstart table_col_fbend +table_end_row +table_reset_row +table_get_col_idx +table_set_col_opt +table_get_col_list +table_set_col_order +table_col_is_printed +table_set_col_order_by_name table_set_formatter +table_set_option_value +table_set_option +table_set_gary_options table_fmt_human_readable table_fmt_machine_readable table_fmt_blockline -table_set_option -table_set_option_value -table_set_gary_options table_col_int -table_col_int_fmt -table_col_int_name table_col_uint -table_col_uint_fmt -table_col_uint_name table_col_double -table_col_double_fmt -table_col_double_name table_col_str -table_col_str_fmt -table_col_str_name table_col_intmax -table_col_intmax_fmt -table_col_intmax_name table_col_s64 -table_col_s64_fmt -table_col_s64_name table_col_uintmax -table_col_uintmax_fmt -table_col_uintmax_name table_col_u64 -table_col_u64_fmt -table_col_u64_name table_col_bool -table_col_bool_name -table_col_bool_fmt -table_append_int -table_append_uint -table_append_double -table_append_str -table_append_intmax -table_append_uintmax -table_append_u64 -table_append_bool # ucw/tbf.h tbf_init tbf_limit @@ -620,6 +603,19 @@ work_queue_cleanup work_submit work_wait work_try_wait +# ucw/xtypes.h +xtype_unit_parser +xtype_parse_fmt +xtype_format_fmt +xt_str +xt_int +xt_s64 +xt_intmax +xt_uint +xt_u64 +xt_uintmax +xt_bool +xt_double # ucw/sorter/common.h sorter_trace sorter_trace_array diff --git a/ucw/table-types.h b/ucw/table-types.h index 004a237b..ab7d3f58 100644 --- a/ucw/table-types.h +++ b/ucw/table-types.h @@ -9,6 +9,13 @@ #include +#ifdef CONFIG_UCW_CLEAN_ABI +#define table_col_size ucw_table_col_size +#define table_col_timestamp ucw_table_col_timestamp +#define xt_size ucw_xt_size +#define xt_timestamp ucw_xt_timestamp +#endif + enum size_units { SIZE_UNIT_BYTE, SIZE_UNIT_KILOBYTE, diff --git a/ucw/table.h b/ucw/table.h index 91a26d43..783c802e 100644 --- a/ucw/table.h +++ b/ucw/table.h @@ -13,48 +13,23 @@ #include #include -// FIXME: update these macros #ifdef CONFIG_UCW_CLEAN_ABI -#define table_append_bool ucw_table_append_bool -#define table_append_double ucw_table_append_double -#define table_append_int ucw_table_append_int -#define table_append_intmax ucw_table_append_intmax -#define table_append_printf ucw_table_append_printf -#define table_append_str ucw_table_append_str -#define table_append_u64 ucw_table_append_u64 -#define table_append_uint ucw_table_append_uint -#define table_append_uintmax ucw_table_append_uintmax #define table_cleanup ucw_table_cleanup #define table_col_bool ucw_table_col_bool -#define table_col_bool_fmt ucw_table_col_bool_fmt -#define table_col_bool_name ucw_table_col_bool_name #define table_col_double ucw_table_col_double -#define table_col_double_fmt ucw_table_col_double_fmt -#define table_col_double_name ucw_table_col_double_name #define table_col_fbend ucw_table_col_fbend #define table_col_fbstart ucw_table_col_fbstart +#define table_col_generic_format ucw_table_col_generic_format #define table_col_int ucw_table_col_int -#define table_col_int_fmt ucw_table_col_int_fmt -#define table_col_int_name ucw_table_col_int_name #define table_col_intmax ucw_table_col_intmax -#define table_col_intmax_fmt ucw_table_col_intmax_fmt -#define table_col_intmax_name ucw_table_col_intmax_name +#define table_col_is_printed ucw_table_col_is_printed #define table_col_printf ucw_table_col_printf #define table_col_s64 ucw_table_col_s64 -#define table_col_s64_fmt ucw_table_col_s64_fmt -#define table_col_s64_name ucw_table_col_s64_name #define table_col_str ucw_table_col_str -#define table_col_str_fmt ucw_table_col_str_fmt -#define table_col_str_name ucw_table_col_str_name +#define table_col_str ucw_table_col_str #define table_col_u64 ucw_table_col_u64 -#define table_col_u64_fmt ucw_table_col_u64_fmt -#define table_col_u64_name ucw_table_col_u64_name #define table_col_uint ucw_table_col_uint -#define table_col_uint_fmt ucw_table_col_uint_fmt -#define table_col_uint_name ucw_table_col_uint_name #define table_col_uintmax ucw_table_col_uintmax -#define table_col_uintmax_fmt ucw_table_col_uintmax_fmt -#define table_col_uintmax_name ucw_table_col_uintmax_name #define table_end ucw_table_end #define table_end_row ucw_table_end_row #define table_fmt_blockline ucw_table_fmt_blockline @@ -63,6 +38,8 @@ #define table_get_col_idx ucw_table_get_col_idx #define table_get_col_list ucw_table_get_col_list #define table_init ucw_table_init +#define table_reset_row ucw_table_reset_row +#define table_set_col_opt ucw_table_set_col_opt #define table_set_col_order ucw_table_set_col_order #define table_set_col_order_by_name ucw_table_set_col_order_by_name #define table_set_formatter ucw_table_set_formatter diff --git a/ucw/xtypes.h b/ucw/xtypes.h index b1f2cc06..d57e8a95 100644 --- a/ucw/xtypes.h +++ b/ucw/xtypes.h @@ -10,6 +10,21 @@ #ifndef _UCW_XTYPE_H #define _UCW_XTYPE_H +#ifdef CONFIG_UCW_CLEAN_ABI +#define xt_bool ucw_xt_bool +#define xt_double ucw_xt_double +#define xt_int ucw_xt_int +#define xt_intmax ucw_xt_intmax +#define xt_s64 ucw_xt_s64 +#define xt_str ucw_xt_str +#define xt_u64 ucw_xt_u64 +#define xt_uint ucw_xt_uint +#define xt_uintmax ucw_xt_uintmax +#define xtype_format_fmt ucw_xtype_format_fmt +#define xtype_parse_fmt ucw_xtype_parse_fmt +#define xtype_unit_parser ucw_xtype_unit_parser +#endif + struct mempool; /**