diff --git a/configure.ac b/configure.ac index 046c59cc..93e6f41a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 ) AC_INIT( [libpff], - [20211105], + [20211114], [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( diff --git a/libpff/libpff_data_array.c b/libpff/libpff_data_array.c index 0569f800..f629535c 100644 --- a/libpff/libpff_data_array.c +++ b/libpff/libpff_data_array.c @@ -457,7 +457,8 @@ int libpff_data_array_read_entries( libcnotify_printf( "\n" ); } -#endif +#endif /* defined( HAVE_DEBUG_OUTPUT ) */ + if( array_entries_level == 0 ) { libcerror_error_set( diff --git a/libpff/libpff_table.c b/libpff/libpff_table.c index c4509323..c740e982 100644 --- a/libpff/libpff_table.c +++ b/libpff/libpff_table.c @@ -2698,7 +2698,7 @@ int libpff_table_read_descriptor_data_list( *descriptor_data_list, recovered, data_block->data, - (size_t) offset_index_value->data_size, + (size_t) data_block->uncompressed_data_size, &total_data_size, 0, error ) != 1 ) diff --git a/m4/python.m4 b/m4/python.m4 index 86d44970..307e15c0 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -1,6 +1,6 @@ dnl Functions for Python bindings dnl -dnl Version: 20201230 +dnl Version: 20211114 dnl Function to check if the python binary is available dnl "python${PYTHON_VERSION} python python# python#.#" @@ -8,13 +8,13 @@ AC_DEFUN([AX_PROG_PYTHON], [AS_IF( [test "x${PYTHON_VERSION}" != x], [ax_python_progs="python${PYTHON_VERSION}"], - [ax_python_progs="python python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5"]) + [ax_python_progs="python python3 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5"]) AC_CHECK_PROGS( [PYTHON], [$ax_python_progs]) AS_IF( [test "x${PYTHON}" != x], - [ax_prog_python_version=`${PYTHON} -c "import sys; sys.stdout.write(sys.version[[:3]])" 2>/dev/null`; + [ax_prog_python_version=`${PYTHON} -c "import sys; sys.stdout.write('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))" 2>/dev/null`; ax_prog_python_platform=`${PYTHON} -c "import sys; sys.stdout.write(sys.platform)" 2>/dev/null`; AC_SUBST( [PYTHON_PLATFORM], @@ -37,7 +37,7 @@ AC_DEFUN([AX_PROG_PYTHON2], [$ax_python2_progs]) AS_IF( [test "x${PYTHON2}" != x], - [ax_prog_python2_version=`${PYTHON2} -c "import sys; sys.stdout.write(sys.version[[:3]])" 2>/dev/null`; + [ax_prog_python2_version=`${PYTHON2} -c "import sys; sys.stdout.write('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))" 2>/dev/null`; AC_SUBST( [PYTHON2_VERSION], [$ax_prog_python2_version]) @@ -58,13 +58,13 @@ AC_DEFUN([AX_PROG_PYTHON2], dnl Function to check if the python3 binary is available dnl "python3 python3.#" AC_DEFUN([AX_PROG_PYTHON3], - [ax_python3_progs="python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0" + [ax_python3_progs="python3 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0" AC_CHECK_PROGS( [PYTHON3], [$ax_python3_progs]) AS_IF( [test "x${PYTHON3}" != x], - [ax_prog_python3_version=`${PYTHON3} -c "import sys; sys.stdout.write(sys.version[[:3]])" 2>/dev/null`; + [ax_prog_python3_version=`${PYTHON3} -c "import sys; sys.stdout.write('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))" 2>/dev/null`; AC_SUBST( [PYTHON3_VERSION], [$ax_prog_python3_version]) @@ -95,7 +95,7 @@ AC_DEFUN([AX_PROG_PYTHON_CONFIG], [test "x${PYTHON_CONFIG}" = x], [AC_CHECK_PROGS( [PYTHON_CONFIG], - [python-config python3-config python3.10-config python3.9-config python3.8-config python3.7-config python3.6-config python3.5-config python3.4-config python3.3-config python3.2-config python3.1-config python3.0-config python2-config python2.7-config python2.6-config python2.5-config]) + [python-config python3-config python3.11-config python3.10-config python3.9-config python3.8-config python3.7-config python3.6-config python3.5-config python3.4-config python3.3-config python3.2-config python3.1-config python3.0-config python2-config python2.7-config python2.6-config python2.5-config]) ]) AS_IF( [test "x${PYTHON_CONFIG}" = x], @@ -131,7 +131,7 @@ AC_DEFUN([AX_PROG_PYTHON3_CONFIG], [test "x${PYTHON3_CONFIG}" = x], [AC_CHECK_PROGS( [PYTHON3_CONFIG], - [python3-config python3.10-config python3.9-config python3.8-config python3.7-config python3.6-config python3.5-config python3.4-config python3.3-config python3.2-config python3.1-config python3.0-config]) + [python3-config python3.11-config python3.10-config python3.9-config python3.8-config python3.7-config python3.6-config python3.5-config python3.4-config python3.3-config python3.2-config python3.1-config python3.0-config]) ]) AS_IF( [test "x${PYTHON3_CONFIG}" = x], diff --git a/manuals/libpff.3 b/manuals/libpff.3 index fcb03941..91e6e70b 100644 --- a/manuals/libpff.3 +++ b/manuals/libpff.3 @@ -1,4 +1,4 @@ -.Dd February 28, 2019 +.Dd November 14, 2021 .Dt libpff 3 .Os libpff .Sh NAME @@ -109,8 +109,6 @@ Available when compiled with libbfio support: .Pp Item functions .Ft int -.Fn libpff_item_clone "libpff_item_t **destination_item" "libpff_item_t *source_item" "libpff_error_t **error" -.Ft int .Fn libpff_item_free "libpff_item_t **item" "libpff_error_t **error" .Ft int .Fn libpff_item_get_identifier "libpff_item_t *item" "uint32_t *identifier" "libpff_error_t **error"