Merge remote-tracking branch 'origin/master' into gh-pages

Author: msune

.github/workflows/ci.yaml

@@ -6,6 +6,9 @@ on:
   schedule:
     - cron: '0 0 * * *'  # every day at midnight
 
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
   gcc_ubuntu_18_04:
     strategy:
@@ -26,7 +29,7 @@ jobs:
           apt-get update && apt-get install -y git
 
       - name: "Checkout libcdada"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: libcdada
 
@@ -53,7 +56,7 @@ jobs:
       CXX: g++-${{ matrix.version }}
     steps:
       - name: "Checkout libcdada"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: libcdada
 
@@ -82,7 +85,7 @@ jobs:
       CXXFLAGS: -gdwarf-4
     steps:
       - name: "Checkout libcdada"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: libcdada
 

AUTHORS

@@ -10,3 +10,4 @@ Contributors, ordered by first contribution date:
 
     Paolo Lucente               <paolo (at) pmacct.net>
     Peter Dobransky             <peter (at) voltanet.io>
+    Petr Vaněk                  <arkamar (at) atlas.cz>

CHANGELOG.md

@@ -9,6 +9,11 @@ Legend:
 - [O] Other
 ```
 
+### v0.6.1 (29th July 2024)
+
+- [O] tests: fix segfault in map_test.c
+- [O] build: cleanup configure.ac from old/deprecated MACROs
+
 ### v0.6.0 (17th April 2024)
 
 - [+] !! BREAKING CHANGE !! Add `prev_val` to `cdada_map_insert_replace()` API call to make it more useful

VERSION

@@ -1 +1 @@
-v0.6.0
+v0.6.1

config_m4/debug.m4

@@ -16,5 +16,3 @@ else
 	AC_MSG_RESULT(no)
 fi
 AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes)
-
-

configure.ac

@@ -6,12 +6,9 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 
-AC_GNU_SOURCE
-
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_LD
 AM_PROG_CC_C_O
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

test/Makefile.am

@@ -67,7 +67,7 @@ benchmark_LDADD= -lpthread ../src/.libs/libcdada.a
 
 #Valgrind
 if VALGRIND_ENABLED
-TESTS_ENVIRONMENT=valgrind --quiet --trace-children=yes --error-exitcode=1 \
+TESTS_ENVIRONMENT=valgrind --trace-children=yes --error-exitcode=1 \
 				--dsymutil=yes --leak-check=yes \
 				--leak-check-heuristics=all \
 				--suppressions=$(top_srcdir)/test/locale.supp

test/map_test.c

@@ -552,7 +552,8 @@ int test_basics(){
 
 	int rv;
 
-	void* ptr_not_null = (void*)0x123;
+	int i = 0x123;
+	void* ptr_not_null = (void*)&i;
 
 	//Create
 	map = cdada_map_create(int);

test/str_test.c

@@ -408,9 +408,9 @@ int test_cmp(){
 			== strncmp(s1, s2, overlen_avoid_compiler_warn));
 
 	TEST_ASSERT(cdada_str_ncmp_c(c1, s2, 7) == strncmp(s1, s2, 7));
-	TEST_ASSERT(cdada_str_ncmp(c1, s2, 10) == strncmp(s1, s2, 10));
-	TEST_ASSERT(cdada_str_ncmp(c1, s2, 12) == strncmp(s1, s2, 12));
-	TEST_ASSERT(cdada_str_ncmp(c1, s2, overlen_avoid_compiler_warn)
+	TEST_ASSERT(cdada_str_ncmp_c(c1, s2, 10) == strncmp(s1, s2, 10));
+	TEST_ASSERT(cdada_str_ncmp_c(c1, s2, 12) == strncmp(s1, s2, 12));
+	TEST_ASSERT(cdada_str_ncmp_c(c1, s2, overlen_avoid_compiler_warn)
 			== strncmp(s1, s2, overlen_avoid_compiler_warn));
 
 	rv = cdada_str_destroy(c1);