X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FDeviceData.cc;h=5f95966edae83aa8b5156ab58289bd49bd8ded33;hb=6dea0b59503a71874c4476c05044fff3c5ae26a5;hp=59327ba68c0a1abdd6c561ce6b94ac31c60b467d;hpb=c4d8504b99fa1e354d15b2b91e4e2797f54ba028;p=lib1wire.git

diff --git a/src/DeviceData.cc b/src/DeviceData.cc
index 59327ba..5f95966 100644
--- a/src/DeviceData.cc
+++ b/src/DeviceData.cc
@@ -110,21 +110,21 @@ Data *DeviceData::find_newest_data(vector<string> year_vector) {
 
 DataRange *DeviceData::get_data_range() {
 	DataRange	*ret_val;
-	vector<string>	year_list;
-	Data		*first_data;
-	Data		*newest_data;
+	vector<string>	y_list;
+	Data		*o_data;
+	Data		*n_data;
 
-	ret_val		= NULL;
-	year_list	= W1Util::get_subdirectories(device_dir);
-	first_data	= find_oldest_data(year_list);
-	if (first_data != NULL) {
-		newest_data	= find_newest_data(year_list);
-		if (newest_data != NULL) {
-			ret_val	= new DataRange(*first_data);
-			ret_val->add_data(*newest_data);
-			delete(newest_data);
+	ret_val	= NULL;
+	y_list	= W1Util::get_subdirectories(device_dir);
+	o_data	= find_oldest_data(y_list);
+	if (o_data != NULL) {
+		n_data	= find_newest_data(y_list);
+		if (n_data != NULL) {
+			ret_val	= new DataRange(o_data);
+			ret_val->add_data(n_data);
+			delete(n_data);
 		}
-		delete(first_data);
+		delete(o_data);
 	}
 	return ret_val;
 }
@@ -227,10 +227,10 @@ DataRange *DeviceData::get_daily_summary(Date *start_date,
 		data	= get_day_summary(date);
 		if (data != NULL) {
 			if (ret_val == NULL) {
-				ret_val	= new DataRange(*data);
+				ret_val	= new DataRange(data);
 			}
 			else {
-				ret_val->add_data(*data);
+				ret_val->add_data(data);
 			}
 			delete(data);
 		}
@@ -288,10 +288,10 @@ DataRange *DeviceData::get_hourly_summary(Date *start_date,
 			data	= (Data *)*iter;
 			if (data != NULL) {
 				if (ret_val == NULL) {
-					ret_val	= new DataRange(*data);
+					ret_val	= new DataRange(data);
 				}
 				else {
-					ret_val->add_data(*data);
+					ret_val->add_data(data);
 				}
 				delete(data);
 			}