Change instant error message to NULL

Change-Id: I5513aa24edbd8d6b6b3626ee12b0dd25bb891224

diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c
index 06175e3..dde3532 100644 (file)
--- a/client/vc_mgr_dbus.c
+++ b/client/vc_mgr_dbus.c
@@ -261,7 +261,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                        SLOG(LOG_DEBUG, TAG_VCM, "===== Get Error");
                        int reason;
                        int daemon_pid;
-                       char* err_msg;
+                       char* err_msg = NULL;
 
                        dbus_message_get_args(msg, &err,
                                DBUS_TYPE_INT32, &reason,
@@ -273,8 +273,16 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                                SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr Get Error message : Get arguments error (%s)", err.message);
                                dbus_error_free(&err);
                        } else {
-                               SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_msg);
-                               __vc_mgr_cb_error(reason, daemon_pid, err_msg);
+                               char* temp_msg = NULL;
+                               if (NULL != err_msg && strcmp("#NULL", err_msg)) {
+                                       temp_msg = strdup(err_msg);
+                               }
+                               SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, temp_msg);
+                               __vc_mgr_cb_error(reason, daemon_pid, temp_msg);
+                               if (NULL != temp_msg) {
+                                       free(temp_msg);
+                                       temp_msg = NULL;
+                               }
                        }
 
                        SLOG(LOG_DEBUG, TAG_VCM, "=====");

diff --git a/server/vcd_dbus.c b/server/vcd_dbus.c
index eed98a8..45c5e4c 100644 (file)
--- a/server/vcd_dbus.c
+++ b/server/vcd_dbus.c
@@ -661,11 +661,6 @@ int vcdc_send_error_signal_to_manager(int manager_pid, int reason, char *err_msg
 {
        SLOG(LOG_ERROR, TAG_VCD, ">>>> Send error signal to manager");
 
-       if (NULL == err_msg) {
-               SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Input parameter is NULL");
-               return VCD_ERROR_INVALID_PARAMETER;
-       }
-
        if (0 != __dbus_check()) {
                return VCD_ERROR_OPERATION_FAILED;
        }
@@ -686,18 +681,34 @@ int vcdc_send_error_signal_to_manager(int manager_pid, int reason, char *err_msg
                return VCD_ERROR_OUT_OF_MEMORY;
        }
 
+       char *temp_msg = NULL;
+       if (NULL == err_msg) {
+               SLOG(LOG_WARN, TAG_VCD, "[Dbus ERROR] Input parameter is NULL");
+               temp_msg = strdup("#NULL");
+       } else {
+               temp_msg = strdup(err_msg);
+       }
+
        daemon_pid = getpid();
-       dbus_message_append_args(msg, DBUS_TYPE_INT32, &reason, DBUS_TYPE_INT32, &daemon_pid, DBUS_TYPE_STRING, &err_msg, DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg, DBUS_TYPE_INT32, &reason, DBUS_TYPE_INT32, &daemon_pid, DBUS_TYPE_STRING, &temp_msg, DBUS_TYPE_INVALID);
 
        if (1 != dbus_connection_send(g_conn_sender, msg, NULL)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send");
+               if (NULL != temp_msg) {
+                       free(temp_msg);
+                       temp_msg = NULL;
+               }
                return VCD_ERROR_OPERATION_FAILED;
        } else {
-               SLOG(LOG_DEBUG, TAG_VCD, "<<<< Send error signal to manager : reason(%d), Error Msg(%s)", reason, err_msg);
+               SLOG(LOG_DEBUG, TAG_VCD, "<<<< Send error signal to manager : reason(%d), Error Msg(%s)", reason, temp_msg);
                dbus_connection_flush(g_conn_sender);
        }
 
        dbus_message_unref(msg);
+       if (NULL != temp_msg) {
+               free(temp_msg);
+               temp_msg = NULL;
+       }
 
        return 0;
 }

diff --git a/server/vcd_server.c b/server/vcd_server.c
index 9242c83..681ae9f 100644 (file)
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@ -902,8 +902,6 @@ static void __vcd_server_error_cb(vcp_error_e error, const char* msg, void *user
        char* error_msg = NULL;
        if (NULL != msg) {
                error_msg = strdup(msg);
-       } else {
-               error_msg = strdup("no message");
        }
 
        if (0 != vcdc_send_error_signal_to_manager(vcd_client_manager_get_pid(), error, error_msg)) {