daemon: Fix return type of espp_service_func_handler which is not used

It is to fix UNREACHABLE_CODE.RET defect.

[Version] 0.3.20

Change-Id: Id9852d477311fef9869ac28af0bae2c6b49863f2
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/espp-service.spec b/packaging/espp-service.spec
index 52f78c30fd09194ba2ccc3bebb7f4c864d1188d9..324b96a390b68d97d96f4e46c0ec0a2eea0fa40e 100644 (file)
--- a/packaging/espp-service.spec
+++ b/packaging/espp-service.spec
@@ -5,8 +5,8 @@
 
 Name:       espp-service
 Summary:    ESPP service package which contains client lib. and daemon binary
-Version:    0.3.19
-Release:    1
+Version:    0.3.20
+Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/project_def.prop b/project_def.prop
index 87c19d00ba0aecd3e3365680e71b41dc3fb09d68..a01b96a42c7e8a7310e25c93e6ee13b36594e4e8 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -11,7 +11,7 @@ profile = mobile-7.0
 USER_SRCS = ./src/daemon/*.c ./src/common/*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.19"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.20"
 
 # User Includes
 USER_INC_DIRS = ./src/daemon ./src/common ./inc ./inc/esplusplayer_capi
@@ -24,6 +24,3 @@ USER_LFLAGS = -Xlinker --allow-shlib-undefined -Xlinker -rpath='/usr/lib'
 
 # User Library Path
 USER_LIB_DIRS = ./libs
-
-# SES Version
-USER_SES_VER = 6.0

diff --git a/src/client/project_def.prop b/src/client/project_def.prop
index e9b2a5d3e86dd19c25c794d0a0f517d6f739dd61..2a1475027ca6fc6e01d3e171762ecf89225d2a06 100644 (file)
--- a/src/client/project_def.prop
+++ b/src/client/project_def.prop
@@ -11,7 +11,7 @@ profile = mobile-7.0
 USER_SRCS = ../common/*.c ./*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.16"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.20"
 
 # User Includes
 USER_INC_DIRS = ../common ./
@@ -24,6 +24,3 @@ USER_LFLAGS = -Xlinker -rpath='/usr/lib'
 
 # User Library Path
 USER_LIB_DIRS =
-
-# SES Version
-USER_SES_VER = 6.0

diff --git a/src/daemon/espp_service_handler.c b/src/daemon/espp_service_handler.c
index e551fc6c671c4d8069de2419631aed7fd25ec4ad..a903ac8d859bf4a9a42b4fac498b2f29446e7beb 100644 (file)
--- a/src/daemon/espp_service_handler.c
+++ b/src/daemon/espp_service_handler.c
@@ -1326,7 +1326,7 @@ static func_handler handlers[] = {
        [ESPP_SERVICE_REQUEST_SET_CALLBACK] = __handle_set_callback,
 };
 
-int espp_service_func_handler(handler_userdata_s *hdata, espp_service_data_from_client_s *data, espp_service_data_from_server_s *result)
+void espp_service_func_handler(handler_userdata_s *hdata, espp_service_data_from_client_s *data, espp_service_data_from_server_s *result)
 {
        ASSERT(hdata);
        ASSERT(hdata->fd >= 0);
@@ -1341,8 +1341,6 @@ int espp_service_func_handler(handler_userdata_s *hdata, espp_service_data_from_
                LOG_WARNING("fd[%d] data[%p, request:%s]", hdata->fd, data, requests[data->request].str);
 
        handlers[data->request](hdata, data, result);
-
-       return 0;
 }
 
 void espp_service_handle_destroy_cb(gpointer data)

diff --git a/src/daemon/espp_service_priv.h b/src/daemon/espp_service_priv.h
index 4e4a384ce00074ebd9141f919732801e55c5b1b6..15d153a544d51d049a2a9fefa7046bbb5f8c7553 100644 (file)
--- a/src/daemon/espp_service_priv.h
+++ b/src/daemon/espp_service_priv.h
@@ -81,7 +81,7 @@ int espp_service_read_buffer(int fd, char *buffer, uint32_t size);
 int espp_service_send_buffer(int fd, const unsigned char *buffer, uint32_t size);
 
 /* handler */
-int espp_service_func_handler(handler_userdata_s *hdata, espp_service_data_from_client_s *data, espp_service_data_from_server_s *result);
+void espp_service_func_handler(handler_userdata_s *hdata, espp_service_data_from_client_s *data, espp_service_data_from_server_s *result);
 void espp_service_handle_destroy_cb(gpointer data);
 
 /* message */

diff --git a/src/daemon/espp_service_socket.c b/src/daemon/espp_service_socket.c
index 3deed186ef102c3500355143a470e46ebb96328b..bf36b63738c12cf920dfb6d8dc2b7cd29d30f728 100644 (file)
--- a/src/daemon/espp_service_socket.c
+++ b/src/daemon/espp_service_socket.c
@@ -109,9 +109,7 @@ static int __request_msg_handling(handler_userdata_s *hdata, bool *event_mode)
        LOG_DEBUG("<<<<< from fd[%d]: request[%s]", fd, requests[rx_data.request].str);
 
        memset(&tx_data, 0x00, write_len);
-       if (espp_service_func_handler(hdata, &rx_data, &tx_data) != 0)
-               LOG_ERROR("failed to espp_service_func_handler()");
-
+       espp_service_func_handler(hdata, &rx_data, &tx_data);
        LOG_DEBUG(">>>>>> to fd[%d]: ret[%d]", fd, tx_data.ret);
 
        if (write(fd, &tx_data, write_len) < 0) {

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 4ed53131e4c870458698a67e29aaa74ed587d464..b1b3a70f17f8a2170ee63595487beb79b4c3acd1 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="7.0" package="com.samsung.tizen.espp-service" version="0.3.19">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="8.0" package="com.samsung.tizen.espp-service" version="0.3.20">
     <profile name="mobile"/>
     <description>espp-service</description>
     <service-application appid="com.samsung.tizen.espp-service" auto-restart="false" exec="espp-service" multiple="false" nodisplay="false" on-boot="false" taskmanage="false" type="capp">