INI: significantly reduce public API

Only leave public what is (or might be potentially) used by
SSSD and gssproxy.

This bumps both .so major version and 'INI_CONFIG_' symbols version.

Author: alexey-tikhonov

Makefile.am

@@ -270,8 +270,7 @@ endif
 
 lib_LTLIBRARIES += libini_config.la
 dist_pkgconfig_DATA += ini/ini_config.pc
-dist_include_HEADERS += ini/ini_config.h ini/ini_configobj.h \
-                        ini/ini_valueobj.h ini/ini_comment.h \
+dist_include_HEADERS += ini/ini_configobj.h \
                         ini/ini_configmod.h
 
 libini_config_la_SOURCES = \
@@ -310,11 +309,16 @@ libini_config_la_LIBADD = \
     $(LTLIBICONV) \
     $(LTLIBINTL)
 libini_config_la_LDFLAGS = \
-    -version-info 7:1:2
+    -version-info 8:0:0
 if HAVE_LD_VERSION_SCRIPT
 libini_config_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/ini/libini_config.sym
 endif
 
+noinst_LTLIBRARIES = libini_config_internal.la
+
+libini_config_internal_la_SOURCES = $(libini_config_la_SOURCES)
+libini_config_internal_la_LIBADD = $(libini_config_la_LIBADD)
+
 dist_noinst_DATA += \
     ini/ini.conf \
     ini/ini.d/real.conf \
@@ -365,51 +369,51 @@ TESTS += \
 
 ini_config_ut_SOURCES = ini/ini_config_ut.c
 ini_config_ut_LDADD = \
-    libini_config.la \
+    libini_config_internal.la \
     libcollection.la
 
 ini_comment_ut_SOURCES = ini/ini_comment_ut.c
-ini_comment_ut_LDADD = libini_config.la
+ini_comment_ut_LDADD = libini_config_internal.la
 
 ini_valueobj_ut_SOURCES = ini/ini_valueobj_ut.c
-ini_valueobj_ut_LDADD = libini_config.la libbasicobjects.la
+ini_valueobj_ut_LDADD = libini_config_internal.la libbasicobjects.la
 
 ini_parse_ut_SOURCES = ini/ini_parse_ut.c
-ini_parse_ut_LDADD = libini_config.la libcollection.la libbasicobjects.la
+ini_parse_ut_LDADD = libini_config_internal.la libcollection.la libbasicobjects.la
 
 ini_augment_ut_SOURCES = ini/ini_augment_ut.c
-ini_augment_ut_LDADD = libini_config.la libcollection.la \
+ini_augment_ut_LDADD = libini_config_internal.la libcollection.la \
                        libbasicobjects.la libpath_utils.la libref_array.la
 
 ini_configmod_ut_SOURCES = ini/ini_configmod_ut.c
-ini_configmod_ut_LDADD = libini_config.la libcollection.la \
+ini_configmod_ut_LDADD = libini_config_internal.la libcollection.la \
                          libbasicobjects.la libpath_utils.la libref_array.la
 
 ini_augment_ut_check_SOURCES = ini/ini_augment_ut_check.c
 ini_augment_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-ini_augment_ut_check_LDADD = libini_config.la $(CHECK_LIBS) \
+ini_augment_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS) \
                              libref_array.la
 
 ini_configmod_ut_check_SOURCES = ini/ini_configmod_ut_check.c
 ini_configmod_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-ini_configmod_ut_check_LDADD = libini_config.la libcollection.la \
+ini_configmod_ut_check_LDADD = libini_config_internal.la libcollection.la \
                                libbasicobjects.la libpath_utils.la \
                                libref_array.la \
                                $(CHECK_LIBS)
 
 ini_parse_ut_check_SOURCES = ini/ini_parse_ut_check.c
 ini_parse_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-ini_parse_ut_check_LDADD = libini_config.la \
+ini_parse_ut_check_LDADD = libini_config_internal.la \
                            libref_array.la \
                            $(CHECK_LIBS)
 
 ini_validators_ut_check_SOURCES = ini/ini_validators_ut_check.c
 ini_validators_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-ini_validators_ut_check_LDADD = libini_config.la $(CHECK_LIBS)
+ini_validators_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS)
 
 
 ini_save_ut_SOURCES = ini/ini_save_ut.c
-ini_save_ut_LDADD = libini_config.la libcollection.la \
+ini_save_ut_LDADD = libini_config_internal.la libcollection.la \
                          libbasicobjects.la libpath_utils.la libref_array.la
 
 ini_config-docs:

contrib/ding-libs.spec.in

@@ -308,15 +308,12 @@ structure
 %defattr(-,root,root,-)
 %doc COPYING
 %doc COPYING.LESSER
-%{_libdir}/libini_config.so.5
-%{_libdir}/libini_config.so.5.2.1
+%{_libdir}/libini_config.so.8
+%{_libdir}/libini_config.so.8.0.0
 
 %files -n libini_config-devel
 %defattr(-,root,root,-)
-%{_includedir}/ini_config.h
 %{_includedir}/ini_configobj.h
-%{_includedir}/ini_valueobj.h
-%{_includedir}/ini_comment.h
 %{_includedir}/ini_configmod.h
 %{_libdir}/libini_config.so
 %{_libdir}/pkgconfig/ini_config.pc

ini/ini_configobj.h

@@ -122,9 +122,7 @@ struct value_obj;
  * - The library allows storing and retrieving multiple key value pairs with
  *   the same key in one section.
  *
- *   <i>There is a deprecated interface that can be found in ini_config.h.
- *   This interface is supported only for backwards compatibility and should
- *   not be used.</i>
+ *   <i>Previously deprecated interface ini_config.h isn't supported anymore.</i>
  */
 
 /**

ini/ini_parse_ut.c

@@ -30,6 +30,7 @@
 #include "ini_defines.h"
 #include "ini_configobj.h"
 #include "ini_config_priv.h"
+#include "ini_valueobj.h"
 #include "simplebuffer.h"
 #include "path_utils.h"
 #define TRACE_HOME

ini/ini_valueobj.h

@@ -138,4 +138,4 @@ int value_merge_comment(struct value_obj *vo_donor,
 /* Print value */
 void value_print(const char *key, struct value_obj *vo);
 
-#endif
+#endif

ini/ini_valueobj_ut.c

@@ -25,6 +25,9 @@
 #include <stdlib.h>
 #include <limits.h>
 
+#include "simplebuffer.h"
+#include "ini_configobj.h"
+#include "ini_config_priv.h"
 #include "ini_valueobj.h"
 #include "ini_defines.h"
 #define TRACE_HOME

ini/libini_config.sym

@@ -1,46 +1,5 @@
-INI_CONFIG_1.1.0 {
+INI_CONFIG_2.0.0 {
 global:
-    /* ini_config.h */
-    config_from_file;
-    config_from_fd;
-    config_from_file_with_metadata;
-    config_from_fd_with_metadata;
-    config_for_app;
-    config_for_app_with_metadata;
-    config_access_check;
-    config_changed;
-    free_ini_config;
-    free_ini_config_errors;
-    free_ini_config_metadata;
-    print_file_parsing_errors;
-    print_config_parsing_errors;
-    get_section_list;
-    free_section_list;
-    get_attribute_list;
-    free_attribute_list;
-    get_config_item;
-    get_int_config_value;
-    get_long_config_value;
-    get_unsigned_config_value;
-    get_ulong_config_value;
-    get_int32_config_value;
-    get_uint32_config_value;
-    get_int64_config_value;
-    get_uint64_config_value;
-    get_double_config_value;
-    get_bool_config_value;
-    get_string_config_value;
-    get_const_string_config_value;
-    get_bin_config_value;
-    free_bin_config_value;
-    get_string_config_array;
-    get_raw_string_config_array;
-    get_long_config_array;
-    get_double_config_array;
-    free_string_config_array;
-    free_long_config_array;
-    free_double_config_array;
-
     /* ini_configobj.h */
     ini_config_create;
     ini_config_destroy;
@@ -91,59 +50,19 @@ global:
     ini_free_long_config_array;
     ini_free_double_config_array;
 
-    /* ini_valueobj.h */
-    value_create_from_refarray;
-    value_lines_cleanup_cb;
-    value_create_arrays;
-    value_add_to_arrays;
-    value_destroy_arrays;
-    value_create_new;
-    value_copy;
-    value_destroy;
-    value_get_concatenated;
-    value_get_concatenated_len;
-    value_get_origin;
-    value_get_line;
-    value_set_keylen;
-    value_set_boundary;
-    value_update;
-    value_extract_comment;
-    value_put_comment;
-    value_merge_comment;
-    value_serialize;
-    value_print;
-
-    /* ini_comment.h */
-    ini_comment_create;
-    ini_comment_destroy;
-    ini_comment_build;
-    ini_comment_build_wl;
-    ini_comment_insert;
-    ini_comment_append;
-    ini_comment_remove;
-    ini_comment_clear;
-    ini_comment_replace;
-    ini_comment_reset;
-    ini_comment_get_numlines;
-    ini_comment_get_line;
-    ini_comment_swap;
-    ini_comment_copy;
-    ini_comment_add;
-    ini_comment_serialize;
-    ini_comment_print;
-
-local:
-    *;
-};
-
-
-INI_CONFIG_1.2.0 {
-global:
-    /* ini_configobj.h */
     ini_config_augment;
 
-    /* ini_comment.h */
-    ini_comment_construct;
+    ini_errobj_create;
+    ini_errobj_destroy;
+    ini_errobj_add_msg;
+    ini_errobj_reset;
+    ini_errobj_get_msg;
+    ini_errobj_count;
+    ini_errobj_next;
+    ini_errobj_no_more_msgs;
+    ini_rules_read_from_file;
+    ini_rules_check;
+    ini_rules_destroy;
 
     /* ini_configmod.h */
     ini_config_add_section;
@@ -175,20 +94,7 @@ global:
     ini_config_save_as;
     ini_config_get_bom;
     ini_config_set_bom;
-} INI_CONFIG_1.1.0;
 
-INI_CONFIG_1.3.0 {
-global:
-    /* ini_configobj.h */
-    ini_errobj_create;
-    ini_errobj_destroy;
-    ini_errobj_add_msg;
-    ini_errobj_reset;
-    ini_errobj_get_msg;
-    ini_errobj_count;
-    ini_errobj_next;
-    ini_errobj_no_more_msgs;
-    ini_rules_read_from_file;
-    ini_rules_check;
-    ini_rules_destroy;
-} INI_CONFIG_1.2.0;
+local:
+    *;
+};

version.m4

@@ -15,4 +15,4 @@ m4_define([DHASH_VERSION_NUMBER], [0.5.0])
 m4_define([COLLECTION_VERSION_NUMBER], [0.7.0])
 m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.5])
 m4_define([BASICOBJECTS_VERSION_NUMBER], [0.1.1])
-m4_define([INI_CONFIG_VERSION_NUMBER], [1.3.1])
+m4_define([INI_CONFIG_VERSION_NUMBER], [2.0.0])