sensord: change return type from bool to int for checking errors

Change-Id: I0b232061df9ed8dd0a4297713e887c7f345a7de4
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/client/sensor_internal.cpp b/src/client/sensor_internal.cpp
index 1a5b0b72398c0a411fbffe9660d1de7f75734db1..31af7d69cc5967327d91fc801754057465befe12 100644 (file)
--- a/src/client/sensor_internal.cpp
+++ b/src/client/sensor_internal.cpp
@@ -617,13 +617,13 @@ API int sensord_add_provider(sensord_provider_h provider)
        int ret;
        sensor_provider *p = static_cast<sensor_provider *>(provider);
 
-       if (!p->connect())
-               return OP_ERROR;
+       ret = p->connect();
+       retv_if(ret < 0, ret);
 
        ret = manager.add_sensor(p);
        if (ret < 0) {
                p->disconnect();
-               return OP_ERROR;
+               return ret;
        }
 
        return OP_SUCCESS;

diff --git a/src/client/sensor_provider.cpp b/src/client/sensor_provider.cpp
index d38049a6859850111bdd7311f96f7390d96a6199..abfd9e10a1cedf156a179182629b7b269f51b9f8 100644 (file)
--- a/src/client/sensor_provider.cpp
+++ b/src/client/sensor_provider.cpp
@@ -119,10 +119,10 @@ int sensor_provider::send_sensor_info(sensor_info *info)
        return OP_SUCCESS;
 }
 
-bool sensor_provider::connect(void)
+int sensor_provider::connect(void)
 {
        m_channel = m_client->connect(m_handler, &m_loop);
-       retvm_if(!m_channel, false, "Failed to connect to server");
+       retvm_if(!m_channel, -EIO, "Failed to connect to server");
 
        /* serialize and send sensor info */
        send_sensor_info(get_sensor_info());
@@ -136,7 +136,7 @@ bool sensor_provider::connect(void)
 
        _I("Provider URI[%s]", get_uri());
 
-       return true;
+       return OP_SUCCESS;
 }
 
 bool sensor_provider::disconnect(void)

diff --git a/src/client/sensor_provider.h b/src/client/sensor_provider.h
index e30e6171ae3f885d62b3e62955171ededadbf21d..b49999512d6c9d804fabdbb13abafa125099773a 100644 (file)
--- a/src/client/sensor_provider.h
+++ b/src/client/sensor_provider.h
@@ -40,7 +40,7 @@ public:
        const char *get_uri(void);
        sensor_info *get_sensor_info(void);
 
-       bool connect(void);
+       int connect(void);
        bool disconnect(void);
        void restore(void);