From 7bdf5aa9790158bd19b5ff2ae1ec841d7ae9f765 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 15 Jun 2014 22:46:30 +0200 Subject: [PATCH] ABI cleanup --- maint/libucw.abi | 40 +++++++++++++++++++++++++++++++++++++++- ucw/mempool.h | 1 + ucw/strtonum.h | 4 +--- ucw/table.h | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/maint/libucw.abi b/maint/libucw.abi index b4fbcd0c..14d7666a 100644 --- a/maint/libucw.abi +++ b/maint/libucw.abi @@ -365,6 +365,7 @@ mp_delete mp_flush mp_stats mp_total_size +mp_shrink mp_alloc_internal mp_alloc mp_alloc_noalign @@ -497,8 +498,45 @@ str_hier_suffix # ucw/strtonum.h str_to_uintmax str_to_uint -# FIXME str_to_uns +# 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_printf +table_append_printf +table_get_col_idx +table_get_col_list +table_col_fbstart +table_col_fbend +table_set_formatter +table_fmt_human_readable +table_fmt_machine_readable +table_set_option +table_set_option_value +table_set_gary_options +table_col_int +table_col_uint +table_col_double +table_col_str +table_col_intmax +table_col_uintmax +table_col_u64 +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 diff --git a/ucw/mempool.h b/ucw/mempool.h index f819a0f1..ee6db64d 100644 --- a/ucw/mempool.h +++ b/ucw/mempool.h @@ -35,6 +35,7 @@ #define mp_realloc ucw_mp_realloc #define mp_realloc_zero ucw_mp_realloc_zero #define mp_restore ucw_mp_restore +#define mp_shrink ucw_mp_shrink #define mp_spread_internal ucw_mp_spread_internal #define mp_start ucw_mp_start #define mp_start_internal ucw_mp_start_internal diff --git a/ucw/strtonum.h b/ucw/strtonum.h index d33c35fc..085bd0b0 100644 --- a/ucw/strtonum.h +++ b/ucw/strtonum.h @@ -11,10 +11,8 @@ #define _STRTONUM_H #ifdef CONFIG_UCW_CLEAN_ABI -#define str_to_uintmax ucw_str_to_uintmax #define str_to_uint ucw_str_to_uint - -// FIXME: For backwards compatibility, will be removed soon +#define str_to_uintmax ucw_str_to_uintmax #define str_to_uns ucw_str_to_uns #endif diff --git a/ucw/table.h b/ucw/table.h index d5ea462a..f6f04db8 100644 --- a/ucw/table.h +++ b/ucw/table.h @@ -10,6 +10,46 @@ #include #include +#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_fbend ucw_table_col_fbend +#define table_col_fbstart ucw_table_col_fbstart +#define table_col_int ucw_table_col_int +#define table_col_intmax ucw_table_col_intmax +#define table_col_printf ucw_table_col_printf +#define table_col_str ucw_table_col_str +#define table_col_u64 ucw_table_col_u64 +#define table_col_uint ucw_table_col_uint +#define table_col_uintmax ucw_table_col_uintmax +#define table_end ucw_table_end +#define table_end_row ucw_table_end_row +#define table_fmt_human_readable ucw_table_fmt_human_readable +#define table_fmt_machine_readable ucw_table_fmt_machine_readable +#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_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 +#define table_set_gary_options ucw_table_set_gary_options +#define table_set_option ucw_table_set_option +#define table_set_option_value ucw_table_set_option_value +#define table_start ucw_table_start +#endif + enum column_type { COL_TYPE_STR, COL_TYPE_INT, -- 2.39.2