Opt: ABI cleanup

diff --git a/tools/libucw.api b/tools/libucw.api
index 34fa6016e436be3b8b912bde113870f78058f90e..24c8ececb643922ae1cda54ad934b2a40a299d9c 100644 (file)
--- a/tools/libucw.api
+++ b/tools/libucw.api
@@ -46,6 +46,7 @@ cf_sections
 cf_find_subitem
 cf_commit_all
 cf_add_dirty
+cf_load_default
 # ucw/conf.h
 cf_new_context
 cf_delete_context
@@ -380,6 +381,14 @@ mp_printf
 mp_vprintf
 mp_printf_append
 mp_vprintf_append
+# ucw/opt.h
+opt_conf_internal
+opt_conf_hook_internal
+opt_parsed_count
+opt_conf_parsed_count
+opt_section_root
+opt_help_internal
+opt_parse
 # ucw/partmap.h
 partmap_open
 partmap_close

diff --git a/ucw/conf-internal.h b/ucw/conf-internal.h
index 7db7de789720efaedf0336ca60fd49dec1652c77..b4ff767f438d5301b3a0ad4a7a9ddb7e394b89a3 100644 (file)
--- a/ucw/conf-internal.h
+++ b/ucw/conf-internal.h
@@ -22,6 +22,7 @@
 #define cf_interpret_line ucw_cf_interpret_line
 #define cf_journal_delete ucw_cf_journal_delete
 #define cf_journal_swap ucw_cf_journal_swap
+#define cf_load_default ucw_cf_load_default
 #define cf_obtain_context ucw_cf_obtain_context
 #define cf_op_names ucw_cf_op_names
 #define cf_sections ucw_cf_sections

diff --git a/ucw/opt.h b/ucw/opt.h
index 4fddf730ae2953ba119aeef5d940ca8ed599be62..54bcde42e1738bddb6852ec0199cc9f84ad12057 100644 (file)
--- a/ucw/opt.h
+++ b/ucw/opt.h
@@ -16,6 +16,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define opt_conf_hook_internal ucw_opt_conf_hook_internal
+#define opt_conf_internal ucw_opt_conf_internal
+#define opt_conf_parsed_count ucw_opt_conf_parsed_count
+#define opt_help_internal ucw_opt_help_internal
+#define opt_parse ucw_opt_parse
+#define opt_parsed_count ucw_opt_parsed_count
+#define opt_section_root ucw_opt_section_root
+#endif
+
 #define OPT_EXIT_BAD_ARGS 2
 
 /***