From cd1b553ed34b7504684cc7188d4c9edac340cf2e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Nov 2024 16:36:19 +0100 Subject: [PATCH] Export more libfvalue functions libesedb_multi_value.c:338:13: error: implicit declaration of function 'libfvalue_value_get_entry'; did you mean 'libfvalue_value_get_data'? [-Wimplicit-function-declaration] libesedb_multi_value.c:385:13: error: implicit declaration of function 'libfvalue_value_copy_entry_data'; did you mean 'libfvalue_value_set_entry_data'? [-Wimplicit-function-declaration] libesedb_record.c:3813:29: error: implicit declaration of function 'libfvalue_value_append_entry'; did you mean 'libfvalue_value_append_entry_data'? [-Wimplicit-function-declaration] libesedb_value_data_handle.c:175:29: error: implicit declaration of function 'libfvalue_data_handle_append_value_entry'; did you mean 'libfvalue_data_handle_append_value_entry_data'? [-Wimplicit-function-declaration] ``libfvalue_value_get_entry`` et al is used externally, by libesedb. Hence, it needs to be exported for DLLs to work correctly. This patch corrects that problem. Fixes: #6 --- include/libfvalue.h.in | 37 +++++++++++++++++++++---------- libfvalue/libfvalue_data_handle.h | 12 ++++++++++ libfvalue/libfvalue_value.h | 25 --------------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/libfvalue.h.in b/include/libfvalue.h.in index d61560d..89c6071 100644 --- a/include/libfvalue.h.in +++ b/include/libfvalue.h.in @@ -210,18 +210,6 @@ int libfvalue_data_handle_set_value_entry_data( int encoding, libfvalue_error_t **error ); -/* Appends a value entry - * Returns if successful or -1 on error - */ -LIBFVALUE_EXTERN \ -int libfvalue_data_handle_append_value_entry_data( - libfvalue_data_handle_t *data_handle, - int *value_entry_index, - const uint8_t *value_entry_data, - size_t value_entry_data_size, - int encoding, - libfvalue_error_t **error ); - /* ------------------------------------------------------------------------- * Integer functions * ------------------------------------------------------------------------- */ @@ -943,6 +931,14 @@ int libfvalue_value_get_number_of_value_entries( int *number_of_value_entries, libfvalue_error_t **error ); +LIBFVALUE_EXTERN \ +int libfvalue_value_get_entry( + libfvalue_value_t *value, + int value_entry_index, + size_t *entry_data_offset, + size_t *entry_data_size, + libcerror_error_t **error ); + /* Retrieves entry data * Returns 1 if successful, 0 if the value has no data or -1 on error */ @@ -967,6 +963,14 @@ int libfvalue_value_set_entry_data( int encoding, libfvalue_error_t **error ); +LIBFVALUE_EXTERN \ +int libfvalue_value_append_entry( + libfvalue_value_t *value, + int *value_entry_index, + size_t entry_data_offset, + size_t entry_data_size, + libcerror_error_t **error ); + /* Appends entry data * Returns 1 if successful or -1 on error */ @@ -979,6 +983,15 @@ int libfvalue_value_append_entry_data( int encoding, libfvalue_error_t **error ); +LIBFVALUE_EXTERN \ +int libfvalue_value_copy_entry_data( + libfvalue_value_t *value, + int value_entry_index, + uint8_t *entry_data, + size_t entry_data_size, + int *encoding, + libcerror_error_t **error ); + /* Copies the value data from a boolean value * Returns 1 if successful, 0 if value could not be set or -1 on error */ diff --git a/libfvalue/libfvalue_data_handle.h b/libfvalue/libfvalue_data_handle.h index 484deda..0055e84 100644 --- a/libfvalue/libfvalue_data_handle.h +++ b/libfvalue/libfvalue_data_handle.h @@ -160,6 +160,18 @@ int libfvalue_data_handle_append_value_entry( size_t value_entry_size, libcerror_error_t **error ); +/* Appends a value entry + * Returns if successful or -1 on error + */ +LIBFVALUE_EXTERN \ +int libfvalue_data_handle_append_value_entry_data( + libfvalue_data_handle_t *data_handle, + int *value_entry_index, + const uint8_t *value_entry_data, + size_t value_entry_data_size, + int encoding, + libfvalue_error_t **error ); + LIBFVALUE_EXTERN \ int libfvalue_data_handle_get_value_entry_data( libfvalue_data_handle_t *data_handle, diff --git a/libfvalue/libfvalue_value.h b/libfvalue/libfvalue_value.h index 4ae99fc..c97402f 100644 --- a/libfvalue/libfvalue_value.h +++ b/libfvalue/libfvalue_value.h @@ -461,14 +461,6 @@ int libfvalue_value_get_number_of_value_entries( int *number_of_value_entries, libcerror_error_t **error ); -LIBFVALUE_EXTERN \ -int libfvalue_value_get_entry( - libfvalue_value_t *value, - int value_entry_index, - size_t *entry_data_offset, - size_t *entry_data_size, - libcerror_error_t **error ); - LIBFVALUE_EXTERN \ int libfvalue_value_set_entry( libfvalue_value_t *value, @@ -477,14 +469,6 @@ int libfvalue_value_set_entry( size_t entry_data_size, libcerror_error_t **error ); -LIBFVALUE_EXTERN \ -int libfvalue_value_append_entry( - libfvalue_value_t *value, - int *value_entry_index, - size_t entry_data_offset, - size_t entry_data_size, - libcerror_error_t **error ); - LIBFVALUE_EXTERN \ int libfvalue_value_get_entry_data( libfvalue_value_t *value, @@ -512,15 +496,6 @@ int libfvalue_value_append_entry_data( int encoding, libcerror_error_t **error ); -LIBFVALUE_EXTERN \ -int libfvalue_value_copy_entry_data( - libfvalue_value_t *value, - int value_entry_index, - uint8_t *entry_data, - size_t entry_data_size, - int *encoding, - libcerror_error_t **error ); - /* Boolean value functions */ LIBFVALUE_EXTERN \