configuration data related changes

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 576d216713e9e5f9223fa753c729d8f5aa1c77ed..22f555960dad5d9a9e1e7de48fd8f9560fe83b52 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -62,7 +62,7 @@ string W1Device::get_name() {
        if (name.empty() == true) {
                cfg     = DeviceConfig::get_device_config(id);
                if (cfg != NULL) {
-                       name    = cfg->get_config_value(DEVICE_CONFIG_VALUE_KEY__NAME);
+                       cfg->get_config_value(DEVICE_CONFIG_VALUE_KEY__NAME, name);
                        delete(cfg);
                }
        }
@@ -76,7 +76,7 @@ void W1Device::set_name(string name_param) {
                name    = name_param;
                cfg     = DeviceConfig::get_device_config(id);
                if (cfg != NULL) {
-                       cfg->set_config_value(DEVICE_CONFIG_VALUE_KEY__NAME, name_param);
+                       cfg->set_config_value(DEVICE_CONFIG_VALUE_KEY__NAME, name_param, true);
                        delete(cfg);
                }
        }
@@ -155,7 +155,10 @@ void W1Device::save_and_clean_cache() {
 
        dec_precision   = get_data_decimal_precision();
        pthread_mutex_lock(&plock);
-       log_debug("memory cache size: %lu\n", memory_cache.size());
+       /* needs to be casted to long unsigned int value is "unsigned int" in some
+           toolchains and that would otherwise cause an warning/error 
+        */
+       log_debug("memory cache size: %lu\n", (long unsigned int)memory_cache.size());
        StoreDay::save(id, &memory_cache, dec_precision);
        while(memory_cache.empty() == false) {
                data    = memory_cache.back();