From 81a7507f3b5cd196c852dccdbb6782bb554b9e78 Mon Sep 17 00:00:00 2001 From: ZhouBox Date: Tue, 10 Mar 2026 09:39:58 +0800 Subject: [PATCH] compile:support gcc 14 --- plugins/restful/rw_handle.c | 13 +++++++------ src/core/manager.c | 2 +- tests/ut/CMakeLists.txt | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/restful/rw_handle.c b/plugins/restful/rw_handle.c index 49ccba0e..8f313de4 100644 --- a/plugins/restful/rw_handle.c +++ b/plugins/restful/rw_handle.c @@ -679,8 +679,8 @@ static void trans(neu_json_write_gtags_req_t *req, neu_req_write_gtags_t *cmd) req->groups[i].tags[k].value.val_array_int64.length; cmd->groups[i].tags[k].value.value.i64s.i64s = - calloc(sizeof(int64_t), - req->groups[i].tags[k].value.val_array_int64.length); + calloc(req->groups[i].tags[k].value.val_array_int64.length, + sizeof(int64_t)); memcpy(cmd->groups[i].tags[k].value.value.i64s.i64s, req->groups[i].tags[k].value.val_array_int64.i64s, @@ -694,8 +694,9 @@ static void trans(neu_json_write_gtags_req_t *req, neu_req_write_gtags_t *cmd) req->groups[i].tags[k].value.val_array_double.length; cmd->groups[i].tags[k].value.value.f64s.f64s = calloc( - sizeof(double), - req->groups[i].tags[k].value.val_array_double.length); + + req->groups[i].tags[k].value.val_array_double.length, + sizeof(double)); memcpy( cmd->groups[i].tags[k].value.value.f64s.f64s, req->groups[i].tags[k].value.val_array_double.f64s, @@ -723,8 +724,8 @@ static void trans(neu_json_write_gtags_req_t *req, neu_req_write_gtags_t *cmd) req->groups[i].tags[k].value.val_array_str.length; cmd->groups[i].tags[k].value.value.strs.strs = - calloc(sizeof(char *), - req->groups[i].tags[k].value.val_array_str.length); + calloc(req->groups[i].tags[k].value.val_array_str.length, + sizeof(char *)); for (size_t j = 0; j < req->groups[i].tags[k].value.val_array_str.length; j++) { diff --git a/src/core/manager.c b/src/core/manager.c index 9a82443b..14fdf8d8 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1987,7 +1987,7 @@ inline static void notify_monitor(neu_manager_t * manager, // monitor not ready, ignore neu_node_manager_t *mgr = manager->node_manager; struct sockaddr_un addr = neu_node_manager_get_addr(mgr, "monitor"); - if (0 == addr.sun_path) { + if (0 == addr.sun_path[0]) { return; } diff --git a/tests/ut/CMakeLists.txt b/tests/ut/CMakeLists.txt index 8212400a..f56a61e6 100644 --- a/tests/ut/CMakeLists.txt +++ b/tests/ut/CMakeLists.txt @@ -24,14 +24,14 @@ target_include_directories(jwt_test PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/utils) -target_link_libraries(jwt_test neuron-base gtest_main gtest jansson ssl crypto jwt libzlog.so) +target_link_libraries(jwt_test neuron-base gtest_main gtest jansson OpenSSL::SSL OpenSSL::Crypto jwt libzlog.so) add_executable(base64_test base64_test.cc ${CMAKE_SOURCE_DIR}/src/utils/base64.c) target_include_directories(base64_test PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/include ) -target_link_libraries(base64_test neuron-base gtest_main gtest crypto) +target_link_libraries(base64_test neuron-base gtest_main gtest OpenSSL::Crypto) aux_source_directory(${CMAKE_SOURCE_DIR}/src/base/tag_sort.c SRC_SORT) add_executable(tag_sort_test tag_sort_test.cc ${SRC_SORT})