From b9fd5a6f7505521f029ebbee0e5036d8dc9adc95 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 14 Mar 2024 15:18:43 +0100 Subject: [PATCH] config module: make it less verbose --- common/config/config_load_configmodule.c | 8 +++++--- common/config/libconfig/config_libconfig.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c index 76808cf59f..5d6fb5de1f 100644 --- a/common/config/config_load_configmodule.c +++ b/common/config/config_load_configmodule.c @@ -208,9 +208,11 @@ int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions } } /* for loop on options */ - printf("[CONFIG] %s: %i/%i parameters successfully set \n", - ((prefix == NULL)?"(root)":prefix), - numdefvals,numoptions ); + printf_params(cfg, + "[CONFIG] %s: %i/%i parameters successfully set \n", + prefix == NULL ? "(root)" : prefix, + numdefvals, + numoptions); if (fatalerror == 1) { fprintf(stderr,"[CONFIG] fatal errors found when assigning %s parameters \n", diff --git a/common/config/libconfig/config_libconfig.c b/common/config/libconfig/config_libconfig.c index b0c3c2c6cf..64737e4067 100644 --- a/common/config/libconfig/config_libconfig.c +++ b/common/config/libconfig/config_libconfig.c @@ -70,7 +70,7 @@ int read_strlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, config_s str=config_setting_get_string_elem(setting,i); if (str==NULL) { - printf("[LIBCONFIG] %s%i not found in config file\n", cfgoptions->optname,i); + printf_params(cfg, "[LIBCONFIG] %s%i not found in config file\n", cfgoptions->optname,i); } else { snprintf(cfgoptions->strlistptr[i], DEFAULT_EXTRA_SZ, "%s",str); st++; @@ -481,9 +481,12 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, } } /* for loop on options */ - printf("[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n", - ((prefix == NULL)?"(root)":prefix), - status,numoptions,numdefvals ); + printf_params(cfg, + "[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n", + prefix == NULL ? "(root)" : prefix, + status, + numoptions, + numdefvals); if (fatalerror == 1) { fprintf(stderr,"[LIBCONFIG] fatal errors found when processing %s \n", libconfig_privdata.configfile ); @@ -517,8 +520,7 @@ int config_libconfig_getlist(configmodule_interface_t *cfg, status = ParamList->numelt = config_setting_length(setting); printf_params(cfg, "[LIBCONFIG] %i %s in config file %s \n", ParamList->numelt, listpath, libconfig_privdata.configfile); } else { - printf("[LIBCONFIG] list %s not found in config file %s \n", - listpath,libconfig_privdata.configfile ); + printf_params(cfg, "[LIBCONFIG] list %s not found in config file %s \n", listpath, libconfig_privdata.configfile); ParamList->numelt= 0; status = -1; }