Merging upstream version 3:4.8.31.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 8 insertions, 8 deletions

diff --git a/tests/lib/search/Makefile.in b/tests/lib/search/Makefile.in
index 2b94a7f..9a38372 100644
--- a/tests/lib/search/Makefile.in
+++ b/tests/lib/search/Makefile.in
@@ -140,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/tests/lib/search/glob_prepare_replace_str.c b/tests/lib/search/glob_prepare_replace_str.c
index 6cc5020..0732980 100644
--- a/tests/lib/search/glob_prepare_replace_str.c
+++ b/tests/lib/search/glob_prepare_replace_str.c
@@ -1,7 +1,7 @@
 /*
    libmc - checks for processing esc sequences in replace string
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:
@@ -77,7 +77,7 @@ START_PARAMETRIZED_TEST (test_glob_prepare_replace_str, test_glob_prepare_replac
 
     /* when */
     mc_search_run (s, data->input_value, 0, strlen (data->input_value), NULL);
-    dest_str = mc_search_prepare_replace_str2 (s, (char *) data->replace_str);
+    dest_str = mc_search_prepare_replace_str2 (s, data->replace_str);
 
     /* then */
     mctest_assert_str_eq (dest_str, data->expected_result);
diff --git a/tests/lib/search/glob_translate_to_regex.c b/tests/lib/search/glob_translate_to_regex.c
index a15df94..15b4073 100644
--- a/tests/lib/search/glob_translate_to_regex.c
+++ b/tests/lib/search/glob_translate_to_regex.c
@@ -1,7 +1,7 @@
 /*
    libmc - checks for processing esc sequences in replace string
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/tests/lib/search/hex_translate_to_regex.c b/tests/lib/search/hex_translate_to_regex.c
index a250bc0..c71490d 100644
--- a/tests/lib/search/hex_translate_to_regex.c
+++ b/tests/lib/search/hex_translate_to_regex.c
@@ -1,7 +1,7 @@
 /*
    libmc - checks for hex pattern parsing
 
-   Copyright (C) 2017-2023
+   Copyright (C) 2017-2024
    Free Software Foundation, Inc.
 
    This file is part of the Midnight Commander.
diff --git a/tests/lib/search/regex_process_escape_sequence.c b/tests/lib/search/regex_process_escape_sequence.c
index c7d7785..1296d13 100644
--- a/tests/lib/search/regex_process_escape_sequence.c
+++ b/tests/lib/search/regex_process_escape_sequence.c
@@ -1,7 +1,7 @@
 /*
    libmc - checks for processing esc sequences in replace string
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/tests/lib/search/regex_replace_esc_seq.c b/tests/lib/search/regex_replace_esc_seq.c
index 7d5cd3e..39298d7 100644
--- a/tests/lib/search/regex_replace_esc_seq.c
+++ b/tests/lib/search/regex_replace_esc_seq.c
@@ -1,7 +1,7 @@
 /*
    libmc - checks for processing esc sequences in replace string
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/tests/lib/search/translate_replace_glob_to_regex.c b/tests/lib/search/translate_replace_glob_to_regex.c
index 4933adf..535bcb2 100644
--- a/tests/lib/search/translate_replace_glob_to_regex.c
+++ b/tests/lib/search/translate_replace_glob_to_regex.c
@@ -1,7 +1,7 @@
 /*
    libmc - checks for processing esc sequences in replace string
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by: