Fix dlog format error

Change-Id: I418ffa0fa7e843df28c104028a8ca77ecf0abffa

diff --git a/callmgr-popup/include/callmgr-popup-debug.h b/callmgr-popup/include/callmgr-popup-debug.h
index 878f491e7fe592e4139381f45faee794e571d746..d4ff5278a893e936c121928e65db2e0818e1a873 100644 (file)
--- a/callmgr-popup/include/callmgr-popup-debug.h
+++ b/callmgr-popup/include/callmgr-popup-debug.h
@@ -52,17 +52,17 @@
 
 #define SEC_ERR(fmt, arg...) \
        do { \
-               SECURE_LOGE(CALLMGR_POPUP_LOG_TAG, fmt"\n", ##arg); \
+               SECURE_RLOG(LOG_ERROR, CALLMGR_POPUP_LOG_TAG, fmt, ##arg); \
        } while(0)
 
 #define SEC_WARN(fmt, arg...) \
        do { \
-               SECURE_LOGW(CALLMGR_POPUP_LOG_TAG, fmt"\n", ##arg); \
+               SECURE_RLOG(LOG_WARN, CALLMGR_POPUP_LOG_TAG, fmt, ##arg); \
        } while(0)
 
 #define SEC_DBG(fmt, arg...) \
        do { \
-               SECURE_LOGD(CALLMGR_POPUP_LOG_TAG, fmt"\n", ##arg); \
+               SECURE_RLOG(LOG_DEBUG, CALLMGR_POPUP_LOG_TAG, fmt, ##arg); \
        } while(0)
 
 #define ret_if(expr) do { \

diff --git a/callmgr-popup/src/callmgr-popup-main.c b/callmgr-popup/src/callmgr-popup-main.c
index 4fabdb0c8b9490ef6a77d37f05956d643e6f2d06..3d165b03d7e49da52803c94ecb513f4929d36c25 100644 (file)
--- a/callmgr-popup/src/callmgr-popup-main.c
+++ b/callmgr-popup/src/callmgr-popup-main.c
@@ -255,7 +255,7 @@ static void __callmgr_popup_app_service(app_control_h app_control, void *user_da
 
                ret = app_control_get_extra_data(app_control, "SUB_INFO", &sub_info);
                if (ret != 0 || !sub_info) {
-                       ERR("app_control_get_extra_data() failed[%d] or no extra_data");
+                       ERR("app_control_get_extra_data() failed[%d] or no extra_data", ret);
                        elm_exit();
                }
                DBG("INFO: [%s]", sub_info);

diff --git a/common/src/callmgr-util.c b/common/src/callmgr-util.c
index 4dda50a0aa5e6146d5cea24b08b2aa34abaad417..15197f768f5380359ec84ac2f1c167b80dd50458 100644 (file)
--- a/common/src/callmgr-util.c
+++ b/common/src/callmgr-util.c
@@ -237,11 +237,15 @@ static gpointer __callmgr_util_launch_voice_call(gpointer data)
 
        dbg("__callmgr_util_launch_voice_call");
        callmgr_thread_data_t *cb_data = (callmgr_thread_data_t*)data;
-       CM_RETURN_VAL_IF_FAIL(cb_data, NULL);
        char buf[2] = {0, };
        bundle *kb = NULL;
        uid_t uid = 0;
 
+       if (!cb_data) {
+               err("db_data is NULL!");
+               return NULL;
+       }
+
        kb = bundle_create();
 
        appsvc_set_operation(kb, APPSVC_OPERATION_CALL);
@@ -274,11 +278,16 @@ static gpointer __callmgr_util_launch_voice_call_by_sat(gpointer data)
 
        dbg("__callmgr_util_launch_voice_call");
        callmgr_thread_data_t *cb_data = (callmgr_thread_data_t*)data;
-       CM_RETURN_VAL_IF_FAIL(cb_data, NULL);
+       //CM_RETURN_VAL_IF_FAIL(cb_data, NULL);
        char buf[500 + 1] = {0, };
        bundle *kb = NULL;
        uid_t uid = 0;
 
+       if (!cb_data) {
+               err("db_data is NULL!");
+               return NULL;
+       }
+
        kb = bundle_create();
 
        appsvc_set_operation(kb, APPSVC_OPERATION_CALL);
@@ -308,11 +317,16 @@ static gpointer __callmgr_util_launch_video_call(gpointer data)
 
        dbg("__callmgr_util_launch_video_call");
        callmgr_thread_data_t *cb_data = (callmgr_thread_data_t*)data;
-       CM_RETURN_VAL_IF_FAIL(cb_data, NULL);
+       //CM_RETURN_VAL_IF_FAIL(cb_data, NULL);
        char buf[2] = {0, };
        bundle *kb = NULL;
        uid_t uid = 0;
 
+       if (!cb_data) {
+               err("db_data is NULL!");
+               return NULL;
+       }
+
        kb = bundle_create();
 /*
  * This operation will work when VT stack and VT UI are support

diff --git a/module/src/callmgr-ringer.c b/module/src/callmgr-ringer.c
index 6ebf1fde0fb6acb64fa9c1abdbfe44fd16e00d99..6c735020febaa0aeee83f721043e6cde421d903d 100644 (file)
--- a/module/src/callmgr-ringer.c
+++ b/module/src/callmgr-ringer.c
@@ -593,7 +593,7 @@ static int __callmgr_ringer_play_vibration(callmgr_ringer_handle_h ringer_handle
 
        ret = device_haptic_open(0, &ringer_handle->haptic_handle);
        if (ret != DEVICE_ERROR_NONE || ringer_handle->haptic_handle == NULL) {
-               err("haptic_open:error : %d, %x", ret, ringer_handle->haptic_handle);
+               err("haptic_open:error : %d, %p", ret, ringer_handle->haptic_handle);
                return -1;
        }
 

diff --git a/module/src/callmgr-telephony.c b/module/src/callmgr-telephony.c
index aae6ef1e7e2ff50ddf4d3e0d4b7dec312f8bb0ed..fc09b4ed845d39e65d466947380f9e795725816b 100644 (file)
--- a/module/src/callmgr-telephony.c
+++ b/module/src/callmgr-telephony.c
@@ -1714,7 +1714,7 @@ static int __callmgr_telephony_init(callmgr_telephony_t telephony_handle)
        while (cp_list[modem_num]) {
                if (modem_num < CALLMGR_TAPI_HANDLE_MAX) {
                        telephony_handle->multi_handles[modem_num] = tel_init(cp_list[modem_num]);
-                       dbg("multi_handles[%d] = 0x%x", modem_num, telephony_handle->multi_handles[modem_num]);
+                       dbg("multi_handles[%d] = 0x%p", modem_num, telephony_handle->multi_handles[modem_num]);
                } else {
                        err("Couldn't supprot this handle. cp_list[%d]:%s", modem_num, cp_list[modem_num]);
                        break;

diff --git a/module/src/callmgr-vr.c b/module/src/callmgr-vr.c
index e69e7f5fb904c7c4b0a367e7a2160661746a113f..582b339f2a2580ec407ec79d29b3f953131a2444 100644 (file)
--- a/module/src/callmgr-vr.c
+++ b/module/src/callmgr-vr.c
@@ -262,7 +262,7 @@ static void __callmgr_vr_recording_status_changed_cb(unsigned long long elapsed_
 //     }
        vr_handle->elapsed_time = elapsed_time;
        if (elapsed_time % 10000 == 0)  // leave a log every 10 seconds
-               info("elapsed_time[%d], file_size[%d]", elapsed_time, file_size);
+               info("elapsed_time[%llu], file_size[%llu]", elapsed_time, file_size);
 
 //     info->cb_type = CM_VR_CB_STATUS;
 //     info->cb_data.recording_status.elapsed_time = elapsed_time;

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index a82194b4cce3d62d036029a83980b09ba64e55f9..0973783776faff7d14521e30ad056fec4e8485c3 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 56
+%define patchlevel 57
 %define ext_feature 0
 
 Name:           call-manager

diff --git a/service/src/callmgr-dbus.c b/service/src/callmgr-dbus.c
index fbb7f456c0aaf1630073d89ca54dbe592a02d0c1..e8c6e7ef04be577f55395c999d7f915d5f1db7a4 100644 (file)
--- a/service/src/callmgr-dbus.c
+++ b/service/src/callmgr-dbus.c
@@ -921,7 +921,7 @@ static gboolean __set_popup_result_handler(GDBusInterfaceSkeleton *di,
        callmgr_core_data_t *core_data = (callmgr_core_data_t *)user_data;
        CM_RETURN_VAL_IF_FAIL(core_data, FALSE);
 
-       dbg("__set_popup_result_handler() is called. popup_type[%d], result[%d]",
+       dbg("__set_popup_result_handler() is called. popup_type[%d], result[%s]",
                popup_type, result == 0 ? "CANCEL" : "OK");
 
        if (popup_type == CALL_POPUP_FLIGHT_MODE) {