Revert "sensor-hal: tw1: change strerror to strerror_r"

This reverts commit 89c6bd75e0b2ed42b8ec9f82ce426810d7a2e055.

diff --git a/src/accel/accel_device.cpp b/src/accel/accel_device.cpp
index afe3c32f7bfe36116de4218ac95487840ceb73e3..a591a8baa420b44509a442533104f43704d615a9 100644 (file)
--- a/src/accel/accel_device.cpp
+++ b/src/accel/accel_device.cpp
@@ -141,7 +141,7 @@ accel_device::accel_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "accel handle open fail for accel processor");
+               _E("accel handle open fail for accel processor, error:%s", strerror(errno));
                throw ENXIO;
        }
 
@@ -320,7 +320,7 @@ bool accel_device::update_value_iio(void)
        int ret = poll(&pfd, 1, -1);
 
        if (ret == -1) {
-               _ERRNO(errno, _E, "Failed to poll from m_node_handle:%d", m_node_handle);
+               _E("poll error:%s m_node_handle:d", strerror(errno), m_node_handle);
                return false;
        } else if (!ret) {
                _E("poll timeout m_node_handle:%d", m_node_handle);

diff --git a/src/geomag/geomag_device.cpp b/src/geomag/geomag_device.cpp
index 42cac82971d904dddda87bc700edccae346bf586..6c44b908f8bd272b61d2c45c5d41c0856b4220d9 100644 (file)
--- a/src/geomag/geomag_device.cpp
+++ b/src/geomag/geomag_device.cpp
@@ -140,7 +140,7 @@ geomag_device::geomag_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "geomag handle open fail for geomag device");
+               _E("geomag handle open fail for geomag device, error:%s\n", strerror(errno));
                throw ENXIO;
        }
 
@@ -321,7 +321,7 @@ bool geomag_device::update_value_iio(void)
        int ret = poll(&pfd, 1, -1);
 
        if (ret == -1) {
-               _ERRNO(errno, _E, "Failed to poll from m_node_handle:%d", m_node_handle);
+               _E("poll error:%s m_node_handle:d", strerror(errno), m_node_handle);
                return false;
        } else if (!ret) {
                _E("poll timeout m_node_handle:%d", m_node_handle);

diff --git a/src/gyro/gyro_device.cpp b/src/gyro/gyro_device.cpp
index bc69152b38f82757d1ced9baa3ae1e8174065e72..327ff904e6702b90cc995499eee4f4f02213431d 100644 (file)
--- a/src/gyro/gyro_device.cpp
+++ b/src/gyro/gyro_device.cpp
@@ -135,7 +135,7 @@ gyro_device::gyro_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "gyro handle open fail for gyro device");
+               _E("gyro handle open fail for gyro device, error:%s", strerror(errno));
                throw ENXIO;
        }
 
@@ -310,7 +310,7 @@ bool gyro_device::update_value_iio(void)
        int ret = poll(&pfd, 1, -1);
 
        if (ret == -1) {
-               _ERRNO(errno, _E, "Failed to poll from m_node_handle:%d", m_node_handle);
+               _E("poll error:%s m_node_handle:d", strerror(errno), m_node_handle);
                return false;
        } else if (!ret) {
                _E("poll timeout m_node_handle:%d", m_node_handle);

diff --git a/src/gyro_uncal/gyro_uncal_device.cpp b/src/gyro_uncal/gyro_uncal_device.cpp
index c9bd995a044f5ad51cb54cb6696d0df0a2fa413d..3a3f7904df25a719ac1db0b5c2f17449255149c1 100644 (file)
--- a/src/gyro_uncal/gyro_uncal_device.cpp
+++ b/src/gyro_uncal/gyro_uncal_device.cpp
@@ -153,7 +153,7 @@ gyro_uncal_device::gyro_uncal_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "gyro_uncal handle open fail for gyro_uncal device");
+               _E("gyro_uncal handle open fail for gyro_uncal device, error:%s", strerror(errno));
                throw ENXIO;
        }
 

diff --git a/src/hrm/hrm_device.cpp b/src/hrm/hrm_device.cpp
index 54d052dc9cd280aa9a283844c2927de0c1971b6d..851db043bbdbe1bfd1366136fc3f098b5f644375 100644 (file)
--- a/src/hrm/hrm_device.cpp
+++ b/src/hrm/hrm_device.cpp
@@ -115,7 +115,7 @@ hrm_device::hrm_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "Failed to open HRM handle");
+               _E("hrm handle open fail for hrm device, error:%s", strerror(errno));
                throw ENXIO;
        }
 

diff --git a/src/hrm_raw/hrm_raw_device.cpp b/src/hrm_raw/hrm_raw_device.cpp
index 694281114d133c9eb763d187217595629867be08..3bd06c9ed9617843cfb762ee3e2348699c468d4c 100644 (file)
--- a/src/hrm_raw/hrm_raw_device.cpp
+++ b/src/hrm_raw/hrm_raw_device.cpp
@@ -147,7 +147,7 @@ hrm_raw_device::hrm_raw_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "hrm raw handle open fail for hrm raw sensor");
+               _E("hrm raw handle open fail for hrm raw sensor, error:%s", strerror(errno));
                throw ENXIO;
        }
 

diff --git a/src/light/light_device.cpp b/src/light/light_device.cpp
index 71dea3db95a3d5679092ca5c33e2f1840f6563a7..32f3fec09baebf135dc0aab9ea4892bab73ffb1c 100644 (file)
--- a/src/light/light_device.cpp
+++ b/src/light/light_device.cpp
@@ -115,7 +115,7 @@ light_device::light_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "light handle open fail for light device");
+               _E("light handle open fail for light device, error:%s", strerror(errno));
                throw ENXIO;
        }
 
@@ -279,7 +279,7 @@ bool light_device::update_value_lux(void)
 
        int len = read(m_node_handle, &light_event, sizeof(light_event));
        if (len == -1) {
-               _ERRNO(errno, _E, "Failed to read from m_node_handle");
+               _D("read(m_node_handle) is error:%s.", strerror(errno));
                return false;
        }
 

diff --git a/src/pressure/pressure_device.cpp b/src/pressure/pressure_device.cpp
index 164f58286a6265a10700890d12e5308dab5c28b4..bf2902e0b936bde9f8a2047f1c42de2e1eae5c2c 100644 (file)
--- a/src/pressure/pressure_device.cpp
+++ b/src/pressure/pressure_device.cpp
@@ -170,7 +170,7 @@ pressure_device::pressure_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "pressure handle open fail for pressure sensor");
+               _E("pressure handle open fail for pressure sensor, error:%s\n", strerror(errno));
                throw ENXIO;
        }
 

diff --git a/src/proxi/proxi_device.cpp b/src/proxi/proxi_device.cpp
index 84cb7c5c4c9bdf25c6c50121e305c40def90fc54..ce2c6c34d25247b2726bd589b8c2d94691172f3d 100644 (file)
--- a/src/proxi/proxi_device.cpp
+++ b/src/proxi/proxi_device.cpp
@@ -104,7 +104,7 @@ proxi_device::proxi_device()
        m_node_handle = open(m_data_node.c_str(), O_RDWR);
 
        if (m_node_handle < 0) {
-               _ERRNO(errno, _E, "proxi handle open fail for proxi device");
+               _E("proxi handle open fail for proxi device, error:%s", strerror(errno));
                throw ENXIO;
        }
 
@@ -175,7 +175,7 @@ bool proxi_device::update_value_input_event(void)
        int len = read(m_node_handle, &proxi_event, sizeof(proxi_event));
 
        if (len == -1) {
-               _ERRNO(errno, _E, "Failed to read from m_node_handle");
+               _D("read(m_node_handle) is error:%s.", strerror(errno));
                return false;
        }
 

diff --git a/src/sensor_log.h b/src/sensor_log.h
index c578858e103e4c868e43d2a4fbfc3fa16c93ef5e..81df2f872cc08e84a78808e5257945bbddcdd477 100644 (file)
--- a/src/sensor_log.h
+++ b/src/sensor_log.h
@@ -48,16 +48,6 @@
 #define _I INFO
 #define _D DBG
 
-#define _ERRNO(errno, tag, fmt, arg...) do { \
-               char buf[1024]; \
-               char *error = strerror_r(errno, buf, 1024); \
-               if (!error) { \
-                       _E("Failed to strerror_r()"); \
-                       break; \
-               } \
-               tag(fmt" (%s[%d])", ##arg, error, errno); \
-       } while (0)
-
 #ifdef _DEBUG
 #define warn_if(expr, fmt, arg...) do { \
                if(expr) { \