From 581b3a2e0f2ad36d5e5e868968bb43c94de3a2a3 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 13 Feb 2023 18:55:18 +0000 Subject: fix: package dependency and unused variable Change-Id: I5dd1b92eeff665bc4e8ad4c1d88f19430bb96a74 (cherry picked from commit da80325f47a9c58aa493441ab54116019811072f) Signed-off-by: Mauro Sardara --- hicn-light/CMakeLists.txt | 13 ++++--------- hicn-plugin/src/hicn_api_test.c | 5 +++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt index 337e22b7f..e82100a91 100644 --- a/hicn-light/CMakeLists.txt +++ b/hicn-light/CMakeLists.txt @@ -23,6 +23,10 @@ project(hicn-light) ############################################################## set(LIBHICN_LIGHT hicn-light) set(LIBHICN_LIGHT_STATIC ${LIBHICN_LIGHT}.static) +set(HICN_LIGHT hicn-light CACHE INTERNAL "" FORCE) +set(HICN_LIGHT_CONTROL ${HICN_LIGHT}-control CACHE INTERNAL "" FORCE) +set(HICN_LIGHT_SHELL ${HICN_LIGHT}-shell CACHE INTERNAL "" FORCE) +set(HICN_LIGHT_DAEMON ${HICN_LIGHT}-daemon CACHE INTERNAL "" FORCE) ############################################################## @@ -49,15 +53,6 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) -############################################################## -# Libs and Bins names -############################################################## -set(HICN_LIGHT hicn-light CACHE INTERNAL "" FORCE) -set(HICN_LIGHT_CONTROL ${HICN_LIGHT}-control CACHE INTERNAL "" FORCE) -set(HICN_LIGHT_SHELL ${HICN_LIGHT}-shell CACHE INTERNAL "" FORCE) -set(HICN_LIGHT_DAEMON ${HICN_LIGHT}-daemon CACHE INTERNAL "" FORCE) - - ############################################################## # Dependencies and third party libs ############################################################## diff --git a/hicn-plugin/src/hicn_api_test.c b/hicn-plugin/src/hicn_api_test.c index e3b942b7b..3ca48d98a 100644 --- a/hicn-plugin/src/hicn_api_test.c +++ b/hicn-plugin/src/hicn_api_test.c @@ -900,6 +900,11 @@ api_hicn_api_mapme_default_route_get (vat_main_t *vam) } } + if (default_route == 0) + { + return 1; + } + /* Construct the API message */ M (HICN_API_MAPME_DEFAULT_ROUTE_GET, mp); -- cgit 1.2.3-korg