REF_ARRAY: merge in INI_CONFIG

alexey-tikhonov · alexey-tikhonov · commit ca60f8904e1c · 2026-02-10T07:24:13.000Z
API is still exposted.
diff --git a/.packit.yaml b/.packit.yaml
@@ -14,7 +14,6 @@ packages:
         - sed -i "s/@PACKAGE_VERSION@/0/g" contrib/ding-libs.spec
         - sed -i "s/@PRERELEASE_VERSION@/99/g" contrib/ding-libs.spec
         - sed -i "s/@DHASH_VERSION@/99.0.0/g" contrib/ding-libs.spec
-        - sed -i "s/@REF_ARRAY_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@INI_CONFIG_VERSION@/99.0.0/g" contrib/ding-libs.spec
       get-current-version:
         - bash -c 'grep "\\[VERSION_NUMBER\\]" version.m4 | sed -E "s/.+\\[([0-9].+)\\].+/\\1/"'
diff --git a/Makefile.am b/Makefile.am
@@ -13,7 +13,6 @@ dist_noinst_DATA = \
     COPYING \
     COPYING.LESSER \
     dhash/libdhash.sym \
-    refarray/libref_array.sym \
     ini/libini_config.sym
 
 ##############################################################################
@@ -164,24 +163,12 @@ endif
 # refarray
 ##############################################################################
 
-lib_LTLIBRARIES += libref_array.la
-dist_pkgconfig_DATA += refarray/ref_array.pc
 dist_include_HEADERS += refarray/ref_array.h
 
-libref_array_la_SOURCES = \
-    refarray/ref_array.c \
-    trace/trace.h
-libref_array_la_DEPENDENCIES = refarray/libref_array.sym
-libref_array_la_LDFLAGS = \
-    -version-info 3:1:2
-if HAVE_LD_VERSION_SCRIPT
-libref_array_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/refarray/libref_array.sym
-endif
-
 check_PROGRAMS += ref_array_ut
 TESTS += ref_array_ut
 ref_array_ut_SOURCES = refarray/ref_array_ut.c
-ref_array_ut_LDADD = libref_array.la
+ref_array_ut_LDADD = libini_config_internal.la
 
 dist_doc_DATA += refarray/README.ref_array
 
@@ -221,6 +208,8 @@ libini_config_la_SOURCES = \
     path_utils/path_utils.h \
     basicobjects/simplebuffer.c \
     basicobjects/simplebuffer.h \
+    refarray/ref_array.c \
+    refarray/ref_array.h \
     collection/collection.c \
     collection/collection_tools.c \
     collection/collection_cnv.c \
@@ -261,7 +250,6 @@ libini_config_la_SOURCES = \
     trace/trace.h
 EXTRA_libini_config_la_DEPENDENCIES = ini/libini_config.sym
 libini_config_la_LIBADD = \
-    libref_array.la \
     $(LTLIBICONV) \
     $(LTLIBINTL)
 libini_config_la_LDFLAGS = \
@@ -336,28 +324,23 @@ ini_parse_ut_SOURCES = ini/ini_parse_ut.c
 ini_parse_ut_LDADD = libini_config_internal.la
 
 ini_augment_ut_SOURCES = ini/ini_augment_ut.c
-ini_augment_ut_LDADD = libini_config_internal.la \
-                       libref_array.la
+ini_augment_ut_LDADD = libini_config_internal.la
 
 ini_configmod_ut_SOURCES = ini/ini_configmod_ut.c
-ini_configmod_ut_LDADD = libini_config_internal.la \
-                         libref_array.la
+ini_configmod_ut_LDADD = libini_config_internal.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_internal.la $(CHECK_LIBS) \
-                             libref_array.la
+ini_augment_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS)
 
 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_internal.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_internal.la \
-                           libref_array.la \
                            $(CHECK_LIBS)
 
 ini_validators_ut_check_SOURCES = ini/ini_validators_ut_check.c
@@ -366,8 +349,7 @@ 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_internal.la \
-                    libref_array.la
+ini_save_ut_LDADD = libini_config_internal.la
 
 ini_config-docs:
 if HAVE_DOXYGEN
diff --git a/configure.ac b/configure.ac
@@ -31,7 +31,6 @@ AC_SUBST([PRERELEASE_VERSION],
          PRERELEASE_VERSION_NUMBER)
 
 AC_SUBST([DHASH_VERSION], DHASH_VERSION_NUMBER)
-AC_SUBST([REF_ARRAY_VERSION], REF_ARRAY_VERSION_NUMBER)
 AC_SUBST([INI_CONFIG_VERSION], INI_CONFIG_VERSION_NUMBER)
 
 AM_CONDITIONAL([GIT_CHECKOUT], [git log -1 >/dev/null 2>&1])
@@ -81,7 +80,7 @@ AC_CONFIG_FILES([Makefile contrib/ding-libs.spec
                  path_utils/path_utils.cfg.doxy
                  dhash/dhash.pc
                  collection/collection.cfg.doxy
-                 refarray/ref_array.cfg.doxy refarray/ref_array.pc
+                 refarray/ref_array.cfg.doxy
                  basicobjects/basicobjects.cfg.doxy
                  ini/ini_config.cfg.doxy ini/ini_config.pc])
 AC_OUTPUT
diff --git a/contrib/ding-libs.spec.in b/contrib/ding-libs.spec.in
@@ -9,7 +9,6 @@ Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %global dhash_version @DHASH_VERSION@
-%global ref_array_version @REF_ARRAY_VERSION@
 %global ini_config_version @INI_CONFIG_VERSION@
 
 ### Patches ###
@@ -20,8 +19,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Obsoletes: libpath_utils <= 0.2.1
 Obsoletes: libcollection <= 0.7.0
 Obsoletes: libbasicobjects <= 0.1.1
+Obsoletes: libref_array <= 0.1.5
 Requires: libdhash = %{dhash_version}-%{release}
-Requires: libref_array = %{ref_array_version}-%{release}
 Requires: libini_config = %{ini_config_version}-%{release}
 
 ### Build Dependencies ###
@@ -36,8 +35,7 @@ BuildRequires: check-devel
 BuildRequires: gettext-devel
 
 %description
-A meta-package that pulls in libdhash, libini_config,
-librefarray.
+A meta-package that pulls in libdhash and libini_config.
 
 %package devel
 Summary: Development packages for ding-libs
@@ -49,13 +47,13 @@ License: LGPLv3+
 Obsoletes: libpath_utils-devel <= 0.2.1
 Obsoletes: libcollection-devel <= 0.7.0
 Obsoletes: libbasicobjects-devel <= 0.1.1
+Obsoletes: libref_array-devel <= 0.1.5
 Requires: libdhash-devel = %{dhash_version}-%{release}
-Requires: libref_array-devel = %{ref_array_version}-%{release}
 Requires: libini_config-devel = %{ini_config_version}-%{release}
 
 %description devel
 A meta-package that pulls in development libraries for
-libdhash, libini_config, librefarray.
+libdhash and libini_config.
 
 ##############################################################################
 # dhash
@@ -99,47 +97,6 @@ time properties
 %doc dhash/README.dhash
 %doc dhash/examples/*.c
 
-##############################################################################
-# ref_array
-##############################################################################
-
-%package -n libref_array
-Summary: A refcounted array for C
-Group: Development/Libraries
-License: LGPLv3+
-Version: %{ref_array_version}
-
-%description -n libref_array
-A dynamically-growing, reference-counted array
-
-%package -n libref_array-devel
-Summary: Development files for libref_array
-Group: Development/Libraries
-Requires: libref_array = %{ref_array_version}-%{release}
-License: LGPLv3+
-Version: %{ref_array_version}
-
-%description -n libref_array-devel
-A dynamically-growing, reference-counted array
-
-%post -n libref_array -p /sbin/ldconfig
-%postun -n libref_array -p /sbin/ldconfig
-
-%files -n libref_array
-%defattr(-,root,root,-)
-%doc COPYING
-%doc COPYING.LESSER
-%{_libdir}/libref_array.so.1
-%{_libdir}/libref_array.so.1.2.1
-
-%files -n libref_array-devel
-%defattr(-,root,root,-)
-%{_includedir}/ref_array.h
-%{_libdir}/libref_array.so
-%{_libdir}/pkgconfig/ref_array.pc
-%doc refarray/README.ref_array
-%doc refarray/doc/html/
-
 ##############################################################################
 # ini_config
 ##############################################################################
@@ -148,7 +105,6 @@ A dynamically-growing, reference-counted array
 Summary: INI file parser for C
 Group: Development/Libraries
 License: LGPLv3+
-Requires: libref_array = %{ref_array_version}-%{release}
 Version: %{ini_config_version}
 
 %description -n libini_config
@@ -159,7 +115,6 @@ Summary: Development files for libini_config
 Group: Development/Libraries
 License: LGPLv3+
 Requires: libini_config = %{ini_config_version}-%{release}
-Requires: libref_array-devel = %{ref_array_version}-%{release}
 Version: %{ini_config_version}
 
 %description -n libini_config-devel
@@ -179,9 +134,11 @@ Library to process config files in INI format
 %defattr(-,root,root,-)
 %{_includedir}/ini_configobj.h
 %{_includedir}/ini_configmod.h
+%{_includedir}/ref_array.h
 %{_libdir}/libini_config.so
 %{_libdir}/pkgconfig/ini_config.pc
 %doc ini/doc/html/
+%doc refarray/README.ref_array
 
 
 ##############################################################################
diff --git a/ini/ini_config.cfg.doxy.in b/ini/ini_config.cfg.doxy.in
@@ -578,7 +578,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @srcdir@/ini_configobj.h @srcdir@/ini_configmod.h
+INPUT                  = @srcdir@/ini_configobj.h @srcdir@/ini_configmod.h @srcdir@/../refarray/ref_array.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/ini/ini_config.pc.in b/ini/ini_config.pc.in
@@ -6,7 +6,6 @@ includedir=@includedir@
 Name: ini_config
 Description: Library to process config files in INI format
 Version: @INI_CONFIG_VERSION@
-Requires: ref_array
 Libs: -L${libdir} -lini_config
 Cflags: -I${includedir}
 URL: https://github.com/SSSD/ding-libs
diff --git a/ini/libini_config.sym b/ini/libini_config.sym
@@ -95,6 +95,22 @@ global:
     ini_config_get_bom;
     ini_config_set_bom;
 
+    /* ref_array.h */
+    ref_array_create;
+    ref_array_getref;
+    ref_array_destroy;
+    ref_array_append;
+    ref_array_get;
+    ref_array_getlen;
+    ref_array_len;
+    ref_array_insert;
+    ref_array_replace;
+    ref_array_remove;
+    ref_array_swap;
+    ref_array_reset;
+    ref_array_debug;
+    ref_array_copy;
+
 local:
     *;
 };
diff --git a/ini/m4/libref_array.m4 b/ini/m4/libref_array.m4
diff --git a/refarray/libref_array.sym b/refarray/libref_array.sym
diff --git a/refarray/ref_array.pc.in b/refarray/ref_array.pc.in
diff --git a/version.m4 b/version.m4
@@ -11,5 +11,4 @@ m4_define([VERSION_NUMBER], [0.6.2])
 m4_define([PRERELEASE_VERSION_NUMBER], [])
 
 m4_define([DHASH_VERSION_NUMBER], [0.5.0])
-m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.5])
 m4_define([INI_CONFIG_VERSION_NUMBER], [2.0.0])
