daemon/handler: Remove unnecessary assert() in handler imple. and add missing checks

espp_service_func_handler() has already checked related parameters
before invoking each handler implementation function.

Change-Id: Id353f1fa8a47aa5aadad4b39ba1d6de9097f850e
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
(cherry picked from commit aad38ea70c4d33d5927b961a8d4874c5dc48b194)

diff --git a/src/daemon/espp_service_handler.c b/src/daemon/espp_service_handler.c
index 7420033..5ebe604 100644 (file)
--- a/src/daemon/espp_service_handler.c
+++ b/src/daemon/espp_service_handler.c
@@ -39,12 +39,6 @@ static void __handle_init_event(handler_userdata_s *hdata, espp_service_data_fro
        tb_data_s *tbs;
        g_autofree gchar *key = NULL;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        ret = espp_service_msg_parse_params(data->params, data->request, &hdata->client.handle_addr);
@@ -67,12 +61,6 @@ static void __handle_create(handler_userdata_s *hdata, espp_service_data_from_cl
        esplusplayer_handle espp;
        tb_data_s *tbs;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        ret = espp_service_msg_parse_params(data->params, data->request, &hdata->client.handle_addr);
@@ -104,12 +92,6 @@ static void __handle_create(handler_userdata_s *hdata, espp_service_data_from_cl
 
 static void __handle_destroy(handler_userdata_s *hdata, espp_service_data_from_client_s *data, espp_service_data_from_server_s *result)
 {
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -127,12 +109,6 @@ static void __handle_open(handler_userdata_s *hdata, espp_service_data_from_clie
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -149,12 +125,6 @@ static void __handle_close(handler_userdata_s *hdata, espp_service_data_from_cli
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -171,12 +141,6 @@ static void __handle_start(handler_userdata_s *hdata, espp_service_data_from_cli
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -193,12 +157,6 @@ static void __handle_stop(handler_userdata_s *hdata, espp_service_data_from_clie
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -215,12 +173,6 @@ static void __handle_pause(handler_userdata_s *hdata, espp_service_data_from_cli
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -237,12 +189,6 @@ static void __handle_resume(handler_userdata_s *hdata, espp_service_data_from_cl
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -259,12 +205,6 @@ static void __handle_prepare_async(handler_userdata_s *hdata, espp_service_data_
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -282,12 +222,6 @@ static void __handle_seek(handler_userdata_s *hdata, espp_service_data_from_clie
        int ret;
        uint64_t time_ms;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -307,12 +241,6 @@ static void __handle_seek(handler_userdata_s *hdata, espp_service_data_from_clie
 
 static void __handle_get_state(handler_userdata_s *hdata, espp_service_data_from_client_s *data, espp_service_data_from_server_s *result)
 {
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -328,12 +256,6 @@ static void __handle_get_playing_time(handler_userdata_s *hdata, espp_service_da
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -371,12 +293,6 @@ static void __handle_set_audio_stream_info(handler_userdata_s *hdata, espp_servi
        esplusplayer_audio_stream_info info;
        g_autofree guchar *codec_data = NULL;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -406,12 +322,6 @@ static void __handle_set_video_stream_info(handler_userdata_s *hdata, espp_servi
        esplusplayer_video_stream_info info;
        g_autofree guchar *codec_data = NULL;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -442,12 +352,6 @@ static void __handle_set_playback_rate(handler_userdata_s *hdata, espp_service_d
        double rate;
        bool mute_audio;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -474,12 +378,6 @@ static void __handle_set_display_surface_id(handler_userdata_s *hdata, espp_serv
        unsigned int surface_id;
        int x, y, w, h;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -502,12 +400,6 @@ static void __handle_set_display_mode(handler_userdata_s *hdata, espp_service_da
        int ret;
        esplusplayer_display_mode mode;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -529,12 +421,6 @@ static void __handle_set_display_roi(handler_userdata_s *hdata, espp_service_dat
        int ret;
        int x, y, w, h;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -559,12 +445,6 @@ static void __handle_set_display_visible(handler_userdata_s *hdata, espp_service
        int ret;
        bool visible;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -587,12 +467,6 @@ static void __handle_set_audio_mute(handler_userdata_s *hdata, espp_service_data
        int ret;
        bool mute;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -614,12 +488,6 @@ static void __handle_set_audio_volume(handler_userdata_s *hdata, espp_service_da
        int ret;
        int volume;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -640,12 +508,6 @@ static void __handle_get_audio_volume(handler_userdata_s *hdata, espp_service_da
 {
        int ret;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
@@ -668,6 +530,8 @@ static void __handle_submit_packet(handler_userdata_s *hdata, espp_service_data_
 
        result->ret = -1;
 
+       RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
+
        memset(&es_packet, 0x0, sizeof(esplusplayer_es_packet));
        ret = espp_service_msg_parse_params(data->params, data->request,
                &es_packet.type, &es_packet.buffer_size,
@@ -707,6 +571,8 @@ static void __handle_submit_eos_packet(handler_userdata_s *hdata, espp_service_d
 
        result->ret = -1;
 
+       RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
+
        ret = espp_service_msg_parse_params(data->params, data->request, &stream_type);
        if (ret != 0)
                return;
@@ -729,6 +595,10 @@ static void __handle_set_buffer_size(handler_userdata_s *hdata, espp_service_dat
        esplusplayer_buffer_option option;
        uint64_t size;
 
+       result->ret = -1;
+
+       RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
+
        ret = espp_service_msg_parse_params(data->params, data->request,
                &option, &size);
        if (ret != 0)
@@ -749,6 +619,10 @@ static void __handle_set_low_latency_mode(handler_userdata_s *hdata, espp_servic
        int ret;
        esplusplayer_low_latency_mode mode;
 
+       result->ret = -1;
+
+       RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
+
        ret = espp_service_msg_parse_params(data->params, data->request, &mode);
        if (ret != 0)
                return;
@@ -770,6 +644,8 @@ static void __handle_set_decoded_video_frame_buffer_type(handler_userdata_s *hda
 
        result->ret = -1;
 
+       RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
+
        ret = espp_service_msg_parse_params(data->params, data->request, &type);
        if (ret != 0)
                return;
@@ -970,12 +846,6 @@ static void __handle_set_callback(handler_userdata_s *hdata, espp_service_data_f
        int ret;
        espp_service_event_e cb_type;
 
-       ASSERT(hdata);
-       ASSERT(data);
-       ASSERT(result);
-       ASSERT(hdata->svc);
-       ASSERT(hdata->fd >= 0);
-
        result->ret = -1;
 
        RET_IF(!g_hash_table_lookup(hdata->svc->fd_table, hdata->key), "failed to g_hash_table_lookup(), key[%s]", hdata->key);