memory leak fixes

[libplp.git] / src / DeviceData.cc

diff --git a/src/DeviceData.cc b/src/DeviceData.cc
index 60edf5e3235f7a7c829e03d62ffeb54152881465..9deed93682a228abee52a6c5831bc72e7eca8d92 100644 (file)
--- a/src/DeviceData.cc
+++ b/src/DeviceData.cc
@@ -1,52 +1,45 @@
 /*
  * DeviceData.cc
  *
- *  Created on: Mar 4, 2011
+ *  Created on: Mar 10, 2011
  *      Author: lamikr
  */
-#include <plp/Device.hh>
+
+#include "Data.hh"
 #include "DeviceData.hh"
+#include "log.h"
 
 using namespace std;
 using namespace plp;
 
-DeviceData::DeviceData(string id_param, string type_param) {
-       id                      = id_param;
-       type                    = type_param;
-       lifecycle_status        = LIFECYCLE_STATUS__UNAVAILABLE;
+DeviceData::DeviceData(string id_param, string type_param) : Device(id_param, type_param) {
+       _latest_data    = NULL;
 }
 
-DeviceData::DeviceData(std::string id_param, std::string type_param, std::string name_param, plp::EnumDeviceLifeCycleStatus status_param) {
-       id                      = id_param;
-       type                    = type_param;
-       name                    = name_param;
-       lifecycle_status        = status_param;
+DeviceData::DeviceData(string id_param,
+               string type_param,
+               string name_param,
+               EnumDeviceLifeCycleStatus status_param,
+               Data *latest_data) : Device(id_param, type_param, name_param, status_param) {
+       _latest_data    = latest_data;
 }
 
 DeviceData::~DeviceData() {
-
-}
-
-string DeviceData::get_id() {
-       return id;
-}
-
-string DeviceData::get_name() {
-       return name;
-}
-
-void DeviceData::set_name(string name_param) {
-       name    = name_param;
-}
-
-EnumDeviceLifeCycleStatus DeviceData::get_lifecycle_state() {
-       return lifecycle_status;
-}
-
-string DeviceData::get_type() {
-       return type;
+       delete(_latest_data);
 }
 
 void DeviceData::printout() {
-
+       string  id;
+
+       log_debug("--- device data --- \n");
+       id      = get_id();
+       log_debug("\tid: %s\n", id.c_str());
+       log_debug("\tname: %s\n", get_name().c_str());
+       log_debug("\ttype: %s\n", get_type().c_str());
+       log_debug("\tlifecycle state: %d\n", get_lifecycle_state());
+       if (_latest_data != NULL)
+               log_debug("data not null\n");
+       else
+               log_debug("data null\n");
+       _latest_data->printout();
 }