configuration data related changes

[lib1wire.git] / src_test / test_w1_datalog_read.cc

diff --git a/src_test/test_w1_datalog_read.cc b/src_test/test_w1_datalog_read.cc
index 48425e21b342069775512f050fcaeb0bc9c2d85d..064831b4bc8c71432bd57b1e87294792e73effd3 100644 (file)
--- a/src_test/test_w1_datalog_read.cc
+++ b/src_test/test_w1_datalog_read.cc
@@ -24,34 +24,11 @@ using namespace std;
 using namespace plp;
 using namespace w1;
 
-bool try_parse_long(const char *str, long *result) {
-       int     new_result;
-       char    *endptr;
-       bool    ret_val;
-
-       ret_val         = false;
-       errno           = 0;
-       new_result      = strtol(str, &endptr, 10);
-       if (errno != 0) {
-               log_error("invalid input %s, could not convert to integer.\n", str);
-       }
-       else {
-               if (endptr == str) {
-                       log_error("invalid input %s, could not convert to integer.\n", str);
-               }
-               else {
-                       *result = new_result;
-                       ret_val = true;
-               }
-       }
-       return ret_val;
-}
-
 int main(int argc, char** argv) {
        string                          loc;
        Data                            *fdata;
        Data                            *ldata;
-       DataReader                      *reader;
+       const DataReader                *reader;
        Device                          *dev;
        SensorDevice                    *device;
        DataRange                       *dr;
@@ -77,7 +54,7 @@ int main(int argc, char** argv) {
                        if (device != NULL) {
                                reader  = device->get_device_data();
                                if (reader != NULL) {
-                                       dr      = reader->get_data_range();
+                                       dr      = ((DataReader *)reader)->get_data_range();
                                        if (dr != NULL) {
                                                fdata   = dr->get_first();
                                                if (fdata != NULL) {
@@ -90,7 +67,7 @@ int main(int argc, char** argv) {
 
                                                                d1      = fdata->get_date();
                                                                d2      = ldata->get_date();
-                                                               dr2     = reader->get_data(&d1, &d2);
+                                                               dr2     = ((DataReader *)reader)->get_data(&d1, &d2);
                                                                if (dr2 != NULL) {
                                                                        dr2->printout();
                                                                        delete(dr2);
@@ -101,10 +78,14 @@ int main(int argc, char** argv) {
                                                }
                                                delete(dr);
                                        }
-                                       delete(reader);
                                }
                        }
                }
        }
+       while (dev_lst.empty() == false) {
+               dev     = dev_lst.back();
+               dev_lst.pop_back();
+               delete(dev);
+       }
        return 0;
 }