From 6ae1b9875e0b804eabdeb10fda23fd8db5fc9f1c Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周三, 01 2月 2023 18:21:12 +0800 Subject: [PATCH] build: allow compilation by C++ compiler --- libscpi/src/error.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libscpi/src/error.c b/libscpi/src/error.c index 858ebfb..8807140 100644 --- a/libscpi/src/error.c +++ b/libscpi/src/error.c @@ -133,7 +133,10 @@ /* SCPIDEFINE_strndup is sometimes a dumy that does not reference it's arguments. Since info_len is not referenced elsewhere caoing to void prevents unusd argument warnings */ (void) info_len; - char * info_ptr = info ? SCPIDEFINE_strndup(&context->error_info_heap, info, info_len) : NULL; + char * info_ptr = NULL; + if (info) { + info_ptr = SCPIDEFINE_strndup(&context->error_info_heap, info, info_len); + } SCPI_ERROR_SETVAL(&error_value, err, info_ptr); if (!fifo_add(&context->error_queue, &error_value)) { SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, true); -- Gitblit v1.9.1