From 11c13388638b78cae931643730742c55ca78af7a Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Fri, 1 Aug 2025 13:10:05 -0500 Subject: [PATCH] Fixed the signed value for start position and start record in BACnet file object abstraction. (#1057) --- ports/posix/bacfile-posix.c | 8 ++++---- ports/posix/bacfile-posix.h | 8 ++++---- src/bacnet/basic/object/bacfile.c | 24 ++++++++++++------------ src/bacnet/basic/object/bacfile.h | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ports/posix/bacfile-posix.c b/ports/posix/bacfile-posix.c index 3be97a1b..ce91d4a3 100644 --- a/ports/posix/bacfile-posix.c +++ b/ports/posix/bacfile-posix.c @@ -90,7 +90,7 @@ bool bacfile_posix_file_size_set(const char *pathname, size_t file_size) */ size_t bacfile_posix_read_stream_data( const char *pathname, - size_t fileStartPosition, + int32_t fileStartPosition, uint8_t *fileData, size_t fileDataLen) { @@ -119,7 +119,7 @@ size_t bacfile_posix_read_stream_data( */ size_t bacfile_posix_write_stream_data( const char *pathname, - size_t fileStartPosition, + int32_t fileStartPosition, const uint8_t *fileData, size_t fileDataLen) { @@ -162,7 +162,7 @@ size_t bacfile_posix_write_stream_data( */ bool bacfile_posix_write_record_data( const char *pathname, - size_t fileStartRecord, + int32_t fileStartRecord, size_t fileIndexRecord, const uint8_t *fileData, size_t fileDataLen) @@ -221,7 +221,7 @@ bool bacfile_posix_write_record_data( */ bool bacfile_posix_read_record_data( const char *pathname, - size_t fileStartRecord, + int32_t fileStartRecord, size_t fileIndexRecord, uint8_t *fileData, size_t fileDataLen) diff --git a/ports/posix/bacfile-posix.h b/ports/posix/bacfile-posix.h index 6b0f522b..a2826328 100644 --- a/ports/posix/bacfile-posix.h +++ b/ports/posix/bacfile-posix.h @@ -21,26 +21,26 @@ bool bacfile_posix_file_size_set(const char *pathname, size_t file_size); BACNET_STACK_EXPORT size_t bacfile_posix_read_stream_data( const char *pathname, - size_t fileStartPosition, + int32_t fileStartPosition, uint8_t *fileData, size_t fileDataLen); BACNET_STACK_EXPORT size_t bacfile_posix_write_stream_data( const char *pathname, - size_t fileStartPosition, + int32_t fileStartPosition, const uint8_t *fileData, size_t fileDataLen); BACNET_STACK_EXPORT bool bacfile_posix_write_record_data( const char *pathname, - size_t fileStartRecord, + int32_t fileStartRecord, size_t fileIndexRecord, const uint8_t *fileData, size_t fileDataLen); BACNET_STACK_EXPORT bool bacfile_posix_read_record_data( const char *pathname, - size_t fileStartRecord, + int32_t fileStartRecord, size_t fileIndexRecord, uint8_t *fileData, size_t fileDataLen); diff --git a/src/bacnet/basic/object/bacfile.c b/src/bacnet/basic/object/bacfile.c index ca57660e..0a171040 100644 --- a/src/bacnet/basic/object/bacfile.c +++ b/src/bacnet/basic/object/bacfile.c @@ -289,7 +289,7 @@ uint32_t bacfile_index_to_instance(unsigned find_index) * @brief Callback function to write record data */ static bool (*bacfile_write_record_data_cb)( - const char *, size_t, size_t, const uint8_t *, size_t) = NULL; + const char *, int32_t, size_t, const uint8_t *, size_t) = NULL; /** * @brief Callback function to write record data @@ -304,7 +304,7 @@ static bool (*bacfile_write_record_data_cb)( */ static bool bacfile_write_record_data_callback( const char *pathname, - size_t fileStartRecord, + int32_t fileStartRecord, size_t record_index, const uint8_t *buffer, size_t buffer_size) @@ -322,7 +322,7 @@ static bool bacfile_write_record_data_callback( * @param callback - function pointer to the callback */ void bacfile_write_record_data_callback_set( - bool (*callback)(const char *, size_t, size_t, const uint8_t *, size_t)) + bool (*callback)(const char *, int32_t, size_t, const uint8_t *, size_t)) { bacfile_write_record_data_cb = callback; } @@ -331,7 +331,7 @@ void bacfile_write_record_data_callback_set( * @brief Callback function to read record data */ static bool (*bacfile_read_record_data_cb)( - const char *, size_t, size_t, uint8_t *, size_t) = NULL; + const char *, int32_t, size_t, uint8_t *, size_t) = NULL; /** * @brief Callback function to read record data @@ -345,7 +345,7 @@ static bool (*bacfile_read_record_data_cb)( */ static bool bacfile_read_record_data_callback( const char *pathname, - size_t fileStartRecord, + int32_t fileStartRecord, size_t record_index, uint8_t *buffer, size_t buffer_size) @@ -363,7 +363,7 @@ static bool bacfile_read_record_data_callback( * @param callback - function pointer to the callback */ void bacfile_read_record_data_callback_set( - bool (*callback)(const char *, size_t, size_t, uint8_t *, size_t)) + bool (*callback)(const char *, int32_t, size_t, uint8_t *, size_t)) { bacfile_read_record_data_cb = callback; } @@ -372,7 +372,7 @@ void bacfile_read_record_data_callback_set( * @brief Callback function to write stream data */ static size_t (*bacfile_write_stream_data_cb)( - const char *, size_t, const uint8_t *, size_t) = NULL; + const char *, int32_t, const uint8_t *, size_t) = NULL; /** * @brief Callback function to write stream data @@ -384,7 +384,7 @@ static size_t (*bacfile_write_stream_data_cb)( */ static size_t bacfile_write_stream_data_callback( const char *pathname, - size_t fileStartPosition, + int32_t fileStartPosition, const uint8_t *buffer, size_t buffer_size) { @@ -401,7 +401,7 @@ static size_t bacfile_write_stream_data_callback( * @param callback - function pointer to the callback */ void bacfile_write_stream_data_callback_set( - size_t (*callback)(const char *, size_t, const uint8_t *, size_t)) + size_t (*callback)(const char *, int32_t, const uint8_t *, size_t)) { bacfile_write_stream_data_cb = callback; } @@ -410,7 +410,7 @@ void bacfile_write_stream_data_callback_set( * @brief Callback function to read stream data */ static size_t (*bacfile_read_stream_data_cb)( - const char *, size_t, uint8_t *, size_t) = NULL; + const char *, int32_t, uint8_t *, size_t) = NULL; /** * @brief Callback function to read stream data @@ -422,7 +422,7 @@ static size_t (*bacfile_read_stream_data_cb)( */ static size_t bacfile_read_stream_data_callback( const char *pathname, - size_t fileStartPosition, + int32_t fileStartPosition, uint8_t *buffer, size_t buffer_size) { @@ -439,7 +439,7 @@ static size_t bacfile_read_stream_data_callback( * @param callback - function pointer to the callback */ void bacfile_read_stream_data_callback_set( - size_t (*callback)(const char *, size_t, uint8_t *, size_t)) + size_t (*callback)(const char *, int32_t, uint8_t *, size_t)) { bacfile_read_stream_data_cb = callback; } diff --git a/src/bacnet/basic/object/bacfile.h b/src/bacnet/basic/object/bacfile.h index 483bf4a7..d0e3b90a 100644 --- a/src/bacnet/basic/object/bacfile.h +++ b/src/bacnet/basic/object/bacfile.h @@ -119,16 +119,16 @@ uint32_t bacfile_write( BACNET_STACK_EXPORT void bacfile_write_stream_data_callback_set( - size_t (*callback)(const char *, size_t, const uint8_t *, size_t)); + size_t (*callback)(const char *, int32_t, const uint8_t *, size_t)); BACNET_STACK_EXPORT void bacfile_read_stream_data_callback_set( - size_t (*callback)(const char *, size_t, uint8_t *, size_t)); + size_t (*callback)(const char *, int32_t, uint8_t *, size_t)); BACNET_STACK_EXPORT void bacfile_write_record_data_callback_set( - bool (*callback)(const char *, size_t, size_t, const uint8_t *, size_t)); + bool (*callback)(const char *, int32_t, size_t, const uint8_t *, size_t)); BACNET_STACK_EXPORT void bacfile_read_record_data_callback_set( - bool (*callback)(const char *, size_t, size_t, uint8_t *, size_t)); + bool (*callback)(const char *, int32_t, size_t, uint8_t *, size_t)); BACNET_STACK_EXPORT void bacfile_file_size_callback_set(size_t (*callback)(const char *)); BACNET_STACK_EXPORT