Applied updates

libyal · Jun 27, 2023 · b78e16c · b78e16c
1 parent 418eb95
commit b78e16c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -116,12 +116,6 @@ environment:
     BUILD_ENVIRONMENT: python
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     PYTHON: "C:\\Python311-x64\\python.exe"
-  - TARGET: macos-tox-py37
-    BUILD_ENVIRONMENT: python-tox
-    APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
-    HOMEBREW_NO_INSTALL_CLEANUP: 1
-    PYTHON_VERSION: 3.7
-    TOXENV: py37
   - TARGET: macos-tox-py38
     BUILD_ENVIRONMENT: python-tox
     APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libewf],
- [20230507],
+ [20230627],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(

diff --git a/libewf/libewf_handle.c b/libewf/libewf_handle.c
@@ -8604,7 +8604,7 @@ int libewf_internal_handle_get_file_entry_by_utf8_path(
 	libewf_lef_file_entry_t *lef_file_entry     = NULL;
 	libewf_lef_file_entry_t *sub_lef_file_entry = NULL;
 	uint8_t *utf8_string_segment                = NULL;
-	static char *function                       = "libewf_handle_get_file_entry_by_utf8_path";
+	static char *function                       = "libewf_internal_handle_get_file_entry_by_utf8_path";
 	size_t utf8_string_index                    = 0;
 	size_t utf8_string_segment_length           = 0;
 	int result                                  = 0;
@@ -8905,7 +8905,7 @@ int libewf_internal_handle_get_file_entry_by_utf16_path(
 	libewf_lef_file_entry_t *lef_file_entry     = NULL;
 	libewf_lef_file_entry_t *sub_lef_file_entry = NULL;
 	uint16_t *utf16_string_segment              = NULL;
-	static char *function                       = "libewf_handle_get_file_entry_by_utf16_path";
+	static char *function                       = "libewf_internal_handle_get_file_entry_by_utf16_path";
 	size_t utf16_string_index                   = 0;
 	size_t utf16_string_segment_length          = 0;
 	int result                                  = 0;

diff --git a/libewf/libewf_section_descriptor.c b/libewf/libewf_section_descriptor.c
@@ -843,7 +843,7 @@ int libewf_section_descriptor_read_data(
 			}
 			else
 			{
-				if( file_offset > ( (off64_t) INT64_MAX - section_descriptor->size ) )
+				if( (uint64_t) file_offset > ( (uint64_t) INT64_MAX - section_descriptor->size ) )
 				{
 					libcerror_error_set(
 					 error,

diff --git a/synclibs.sh b/synclibs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script that synchronizes the local library dependencies
 #
-# Version: 20210513
+# Version: 20230510
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
@@ -52,7 +52,8 @@ do
 	fi
 
 	LOCAL_LIB_UPPER=`echo "${LOCAL_LIB}" | tr "[a-z]" "[A-Z]"`;
-	LOCAL_LIB_VERSION=`grep -A 2 AC_INIT ${LOCAL_LIB}-$$/configure.ac | tail -n 1 | sed 's/^\s*\[\([0-9]*\)\],\s*$/\1/'`;
+	# Note that sed on FreeBSD does not support \s hence that we use [[:space:]] instead.
+	LOCAL_LIB_VERSION=`grep -A 2 AC_INIT ${LOCAL_LIB}-$$/configure.ac | tail -n 1 | sed 's/^[[:space:]]*\[\([0-9]*\)\],[[:space:]]*$/\1/'`;
 	LOCAL_LIB_MAKEFILE_AM="${LOCAL_LIB}/Makefile.am";
 
 	cp ${LOCAL_LIB}-$$/${LOCAL_LIB}/*.[chly] ${LOCAL_LIB};