X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1DataList.cc;h=9f2674f0971b35b328fcb56f74272212fd0427f8;hb=83dba70b46600014932da34e8744ba70584077aa;hp=844db8e34a435359b76e230e0f9a9f62befcf93b;hpb=9c47855d3ddc3d09b9733c43d420a7d5b739bd37;p=lib1wire.git

diff --git a/src/W1DataList.cc b/src/W1DataList.cc
index 844db8e..9f2674f 100644
--- a/src/W1DataList.cc
+++ b/src/W1DataList.cc
@@ -12,6 +12,7 @@
 #include "W1Util.hh"
 #include "W1DataList.hh"
 #include "W1Store.hh"
+#include "DeviceConfig.hh"
 
 #include "plp/log.h"
 
@@ -25,7 +26,7 @@ W1DataList::W1DataList(string device_id_param) {
 	device_config		= new DeviceConfig(device_id_param);
 	summary_calc_type	= device_config->get_summary_calculation_type();
 	device_id		= device_id_param;
-	base_dir		= W1Store::get_base_dir_name();
+	base_dir		= DeviceConfig::get_base_dir_name();
 	device_dir		= W1Util::concat_paths(base_dir, device_id);
 	device_ch_dir		= W1Util::concat_paths(base_dir, "cache");
 	device_ch_dir		= W1Util::concat_paths(device_ch_dir, device_id);
@@ -36,7 +37,7 @@ W1DataList::~W1DataList() {
 }
 
 Data *W1DataList::find_oldest_data(vector<string> year_vector) {
-	int 		ii;
+	unsigned int 	ii;
 	string		year_dir;
 	string		month_dir;
 	vector<string>	month_vector;
@@ -108,8 +109,6 @@ Data *W1DataList::find_newest_data(vector<string> year_vector) {
 
 DataRange *W1DataList::get_data_range() {
 	DataRange	*ret_val;
-	DIR		*data_dir;
-	struct dirent	*year_dirent;
 	vector<string>	year_list;
 	Data		*first_data;
 	Data		*newest_data;