Fix savce issue from SVACE tool version 2.2

Change-Id: Icb1de21dd79e3a03ec4724ecba28deff05ffef09

diff --git a/callmgr-popup/src/callmgr-popup-util.c b/callmgr-popup/src/callmgr-popup-util.c
index 9273f0725432c12f2ba43480f7c508689aeebf07..bd97a9f75ce44fd844b1ed3d42c9d3298b86b37a 100644 (file)
--- a/callmgr-popup/src/callmgr-popup-util.c
+++ b/callmgr-popup/src/callmgr-popup-util.c
@@ -153,8 +153,7 @@ char *_callmgr_popup_get_call_err_string(callmgr_call_err_type_e type, char *num
                break;
        default:
                WARN("Invalid info");
-               string = NULL;
-               break;
+               return NULL;
        }
 
        if (type == ERR_IS_NOT_EMERGENCY_E) {

diff --git a/module/src/callmgr-answer-msg.c b/module/src/callmgr-answer-msg.c
index ecfaf3c5b6ba16e03cb047417a4b82a263f81456..b35b33dca36eb5b4ec17b46ceb8482b0663d777d 100644 (file)
--- a/module/src/callmgr-answer-msg.c
+++ b/module/src/callmgr-answer-msg.c
@@ -81,11 +81,6 @@ static void __callmgr_answer_msg_player_prepare_cb(void *data)
        player_h h_player_handle = NULL;
        int ret = PLAYER_ERROR_NONE;
 
-       if (data == NULL) {
-               err("Handle = NULL, returning");
-               return;
-       }
-
        h_player_handle = (player_h)data;
 
        /* Start the player */

diff --git a/module/src/callmgr-vr.c b/module/src/callmgr-vr.c
index cbda224dfb226c50b66028b9c6646c983ef795e2..2b90d8207f890ccb5a373fbcc23e652facee7488 100644 (file)
--- a/module/src/callmgr-vr.c
+++ b/module/src/callmgr-vr.c
@@ -590,13 +590,8 @@ int _callmgr_vr_init(callmgr_vr_handle_h *vr_handle, vr_event_cb cb_fn, void *us
 int _callmgr_vr_deinit(callmgr_vr_handle_h vr_handle)
 {
        CM_RETURN_VAL_IF_FAIL(vr_handle, -1);
-       if (vr_handle == NULL) {
-               err("vr_handle is NULL");
-               return -1;
-       } else {
-               if (vr_handle->recorder_handle != NULL) {
-                       __callmgr_vr_destroy(vr_handle);
-               }
+       if (vr_handle->recorder_handle != NULL) {
+               __callmgr_vr_destroy(vr_handle);
        }
 
        g_free(vr_handle);
@@ -1099,8 +1094,8 @@ static int __callmgr_vr_update_answering_msg_media_info(callmgr_vr_handle_h vr_h
        if (ret == MEDIA_CONTENT_ERROR_NONE) {
 #if 0 /*remove media product header*/
                ret = media_cloud_info_insert_to_db_without_info(full_path, MEDIA_CONTENT_STORAGE_ANSWERMEMO_EX, &info);
-#endif
                if (ret == MEDIA_CONTENT_ERROR_NONE) {
+#endif
                        result = 0;
 
                        ret = media_info_set_display_name(info, vr_handle->disp_name);
@@ -1123,10 +1118,12 @@ static int __callmgr_vr_update_answering_msg_media_info(callmgr_vr_handle_h vr_h
                                err("media_info_update_to_db().. [%d]", ret);
                                result = -1;
                        }
+#if 0 /*remove media product header*/
                } else {
                        err("media_cloud_info_insert_to_db_without_info().. [%d]", ret);
                        result = -1;
                }
+#endif
                /* info can't be true due to media_cloud_info_insert_to_db_without_info blocked*/
                /*if (info) {*/
                        media_info_destroy(info);

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index dd740afe86e6ed13b29d46b7b692a9d79013bafb..2b5b2f6086f5cee80dffc59627471b2d12c1caa2 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 87
+%define patchlevel 88
 %define ext_feature 0
 
 Name:           call-manager