From cd040a4ce1ea3d2008048083a862461596cd2cd2 Mon Sep 17 00:00:00 2001 From: Sebastian Lipponer Date: Mon, 25 Nov 2019 08:22:11 +0100 Subject: Change the DLT_CHECK_RCV_DATA_SIZE macro to an internal function (#191) The use of this macro in a if condition is actually non-standard C++ code. GCC issues a warning that ISO C++ forbids braced-groups within expressions when compiled with -Wpedantic. Other compilers fail with an error. Change the macro to an internal function in order to improve the portability to other platforms (i.e. MSVC, proprietary embedded). Signed-off-by: Sebastian Lipponer --- include/dlt/dlt_common.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index f4248ea..82ef7e1 100644 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -218,17 +218,6 @@ enum { # define GET_LOG_INFO_LENGTH 13 # define SERVICE_OPT_LENGTH 3 -/* checks if received size is big enough for expected data */ -# define DLT_CHECK_RCV_DATA_SIZE(received, required) \ - ({ \ - int _ret = DLT_RETURN_OK; \ - if (((int)received - (int)required) < 0) { \ - dlt_vlog(LOG_WARNING, "%s: Received data not complete\n", __func__); \ - _ret = DLT_RETURN_ERROR; \ - } \ - _ret; \ - }) - /** * Get the size of extra header parameters, depends on htyp. */ @@ -1249,6 +1238,13 @@ DltReturnValue dlt_set_storageheader(DltStorageHeader *storageheader, const char */ DltReturnValue dlt_check_storageheader(DltStorageHeader *storageheader); +/** + * Checks if received size is big enough for expected data + * @param received size + * @param required size + * @return negative value if required size is not sufficient + * */ +DltReturnValue dlt_check_rcv_data_size(int received, int required); /** * Initialise static ringbuffer with a size of size. -- cgit v1.2.1