From 7d2a17a88bd73eb9afa5b0279156df1710b054c2 Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Wed, 18 May 2016 20:52:46 +0900 Subject: [PATCH] sensord: add log message in destructor of sensors - add NULL check in get_name() in physical_sensor Change-Id: Idef67bd894d46e141a674302415893015131437e Signed-off-by: kibak.yoon --- src/sensor/hrm/hrm_sensor.cpp | 1 + src/server/physical_sensor.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sensor/hrm/hrm_sensor.cpp b/src/sensor/hrm/hrm_sensor.cpp index aa48965..d29ff49 100644 --- a/src/sensor/hrm/hrm_sensor.cpp +++ b/src/sensor/hrm/hrm_sensor.cpp @@ -30,4 +30,5 @@ hrm_sensor::hrm_sensor() hrm_sensor::~hrm_sensor() { + _I("hrm_sensor is destroyed : %#x", this); } diff --git a/src/server/physical_sensor.cpp b/src/server/physical_sensor.cpp index 689ffed..b16561d 100644 --- a/src/server/physical_sensor.cpp +++ b/src/server/physical_sensor.cpp @@ -32,6 +32,7 @@ physical_sensor::physical_sensor() physical_sensor::~physical_sensor() { + _I("physical sensor is destroyed"); } void physical_sensor::set_sensor_info(const sensor_info_t *info) @@ -56,8 +57,8 @@ unsigned int physical_sensor::get_event_type(void) const char* physical_sensor::get_name(void) { - if (!m_info->name) - return UNKNOWN_NAME; + retv_if(!m_info, UNKNOWN_NAME); + retv_if(!m_info->name, UNKNOWN_NAME); return m_info->name; } -- 2.7.4