From 2cdc3f40842afe29f3ea07f11e52b1eb824dabd5 Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Fri, 17 Jun 2011 01:46:53 +0300 Subject: [PATCH] cleanups Signed-off-by: Mika Laitio --- src/DataReader.cc | 1 + src/DeviceConfig.cc | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DataReader.cc b/src/DataReader.cc index 9731bce..00f861a 100644 --- a/src/DataReader.cc +++ b/src/DataReader.cc @@ -34,6 +34,7 @@ bool string_to_number(NumberDataType& result, DataReader::DataReader(string device_id_param) { string base_dir; + log_debug("device_id: %s\n", device_id_param.c_str()); device_config = NULL; device_id = device_id_param; base_dir = DeviceConfig::get_base_dir_name(); diff --git a/src/DeviceConfig.cc b/src/DeviceConfig.cc index c3e8bad..9b3a100 100644 --- a/src/DeviceConfig.cc +++ b/src/DeviceConfig.cc @@ -287,6 +287,8 @@ ConfigHandle *DeviceConfig::load_device_config(string device_id_param) { struct uci_package *pkg; string cfg_fl; string cfg_dir; + int b_count; + char *fname; ConfigHandle *ret_val; ret_val = NULL; @@ -299,14 +301,11 @@ ConfigHandle *DeviceConfig::load_device_config(string device_id_param) { if (access(cfg_fl.c_str(), R_OK) == 0) { ctx = uci_alloc_context(); if (ctx != NULL) { - //log_debug("uci_set_confdir: %s\n", cfg_dir.c_str()); + log_debug("confdir: %s, file: %s\n", cfg_dir.c_str(), cfg_fl.c_str()); uci_set_confdir(ctx, cfg_dir.c_str()); err_flg = uci_load(ctx, cfg_fl.c_str(), &pkg); if (err_flg == UCI_OK) { //log_debug("Loaded device configuration: %s.\n", cfg_fl.c_str()); - int b_count; - char *fname; - b_count = strlen(cfg_dir.c_str()) + strlen(cfg_fl.c_str()) + 10; fname = (char *)calloc(1, b_count); if (fname != NULL) { @@ -336,9 +335,9 @@ ConfigHandle *DeviceConfig::load_device_config(string device_id_param) { return ret_val; } -DeviceConfig *DeviceConfig::get_device_config(string device_id) { +DeviceConfig *DeviceConfig::get_device_config(string device_id_param) { DeviceConfig *ret_val; - ret_val = new DeviceConfig(device_id); + ret_val = new DeviceConfig(device_id_param); return ret_val; } -- 2.41.1