cleanups, renamed get_*_values functions to get_*_data

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 46e5b7046e7e173e0ddc54a64ac319c304de31fa..6719be76c32ea428a363f4c85d17986ebebb8e44 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -68,23 +68,23 @@ string W1Device::get_time() {
 void W1Device::printout() {
        string text;
 
-       text    = get_formatted_value();
+       text    = get_formatted_data();
        cout << text << endl;
 }
 
-string W1Device::get_formatted_value() {
+string W1Device::get_formatted_data() {
        string ret_val;
        string val;
 
-       val     = get_raw_value();
-       ret_val = get_formatted_value(val);
+       val     = get_raw_data();
+       ret_val = get_formatted_data(val);
        return ret_val;
 }
 
-string W1Device::get_formatted_value(string value) {
+string W1Device::get_formatted_data(string raw_data) {
        string ret_val;
 
-       ret_val = get_time() + "|" + value + " " + get_unit();
+       ret_val = get_time() + "|" + raw_data + " " + get_unit();
        add_to_memory_cache(ret_val);
        return ret_val;
 }