Print error message

Change-Id: I3bd9f8bc604236ee22b7aba98b927d0400388fd0
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/receiver/inc/sticker_info.h b/receiver/inc/sticker_info.h
index bad7dc3..28420f4 100644 (file)
--- a/receiver/inc/sticker_info.h
+++ b/receiver/inc/sticker_info.h
@@ -21,6 +21,6 @@ void insert_sticker_data(const char *filepath, const char *keyword, const char *
 void create_sticker_provider_handle(void);
 void destroy_sticker_provider_handle(void);
 void delete_sticker_data(const char *fileName);
-void delete_all_stickers(const char *groupName);
+bool delete_all_stickers(const char *groupName);
 
 #endif /* __STICKER_INFO_H__ */

diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp
index 629d54f..a6a06e4 100644 (file)
--- a/receiver/src/ft.cpp
+++ b/receiver/src/ft.cpp
@@ -222,7 +222,7 @@ static void _on_transfer_completed(sap_file_transaction_h file_transaction,
 
             int ret = thumbnail_util_extract_to_file(sticker_data.file_path.c_str(), THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, sticker_data.thumbnail_path.c_str());
             if (ret != THUMBNAIL_UTIL_ERROR_NONE) {
-                STLOGE("Failed to create thumbnail. msg : %s", get_error_message(ret));
+                STLOGE("Failed to create thumbnail. msg : '%s'", get_error_message(ret));
                 sticker_data.thumbnail_path.clear();
             }
 
@@ -584,7 +584,7 @@ void request_show_sync_notification()
 void reject_file()
 {
     int ret = sap_file_transfer_reject(priv_data.file_socket);
-    STLOGI("ret : %d", ret);
+    STLOGI("Failed to call sap_file_transfer_reject(). error code : 0x%X, message : %s", ret, get_error_message(ret));
 
     file_on_progress = FALSE;
 }
@@ -687,7 +687,7 @@ static void send_sync_start_response(int result_code)
             break;
     }
 
-    STLOGD("result code : %d, sync complete flag : %d", result_code, sync_complete_flags);
+    STLOGD("result code : 0x%X, sync complete flag : %d", result_code, sync_complete_flags);
 
 #ifdef VCONFKEY_STICKER_SUPPORTED_FEATURE
     if (vconf_get_int(VCONFKEY_STICKER_SUPPORTED_FEATURE, &feature_flag) != 0)
@@ -1023,7 +1023,7 @@ static void on_conn_req(sap_peer_agent_h peer_agent,
         STLOGW("Connection failure unknown");
         break;
     default:
-        STLOGW("Connection failure. error code : %d", result);
+        STLOGW("Connection failure. error code : 0x%X", result);
         break;
     }
 }

diff --git a/receiver/src/sticker_info.cpp b/receiver/src/sticker_info.cpp
index fa7c2ff..4ef95b4 100644 (file)
--- a/receiver/src/sticker_info.cpp
+++ b/receiver/src/sticker_info.cpp
@@ -104,7 +104,7 @@ insert_sticker_data(const char *filepath, const char *keyword, const char *group
 
     ret = sticker_provider_insert_data(sticker_provider, data_handle);
     if (ret != STICKER_ERROR_NONE) {
-        STLOGE("Failed to insert data. error code : %x. message : %s", ret, get_error_message(ret));
+        STLOGE("Failed to insert data. error code : %x. message : '%s'", ret, get_error_message(ret));
     }
     else {
         STLOGI("Succeeded to insert data");
@@ -124,7 +124,7 @@ void create_sticker_provider_handle(void)
     ret = sticker_provider_create(&sticker_provider);
     if (ret != STICKER_ERROR_NONE) {
         /* Error handling */
-        STLOGE("Failed to create sticker provider. ret : %d", ret);
+        STLOGE("Failed to create sticker provider. error code : 0x%X, message : '%s'", ret, get_error_message(ret));
     }
 }
 
@@ -139,7 +139,7 @@ void delete_sticker_data(const char *fileName)
     int ret;
     ret = sticker_provider_delete_data_by_uri(sticker_provider, fileName);
     if (ret != STICKER_ERROR_NONE)
-        STLOGE("Failed to delete sticker. ret : %d", ret);
+        STLOGE("Failed to delete sticker. error code : 0x%X, message : '%s'", ret, get_error_message(ret));
 }
 
 static void _delete_all_stickers_cb(sticker_data_h data_handle, void *user_data)
@@ -150,16 +150,16 @@ static void _delete_all_stickers_cb(sticker_data_h data_handle, void *user_data)
 
     ret = sticker_data_get_group_name(data_handle, &sticker_group);
     if (ret != STICKER_ERROR_NONE)
-        STLOGE("Failed to get group name. ret : %d", ret);
+        STLOGE("Failed to get group name. error code : 0x%X, message : '%s'", ret, get_error_message(ret));
 
     if (strcmp(sticker_group, del_group) == 0) {
         ret = sticker_provider_delete_data(sticker_provider, data_handle);
         if (ret != STICKER_ERROR_NONE)
-            STLOGE("Failed to delete sticker. ret : %d", ret);
+            STLOGE("Failed to delete sticker. error code : 0x%X, message : '%s'", ret, get_error_message(ret));
     }
 }
 
-void delete_all_stickers(const char *groupName)
+bool delete_all_stickers(const char *groupName)
 {
     int ret;
     int total_cnt;
@@ -167,9 +167,11 @@ void delete_all_stickers(const char *groupName)
 
     ret = sticker_provider_get_sticker_count(sticker_provider, &total_cnt);
     if (ret != STICKER_ERROR_NONE)
-        STLOGE("Failed to get sticker count. ret : %d", ret);
+        STLOGE("Failed to get sticker count. error code : 0x%X, message : '%s'", ret, get_error_message(ret));
 
     ret = sticker_provider_data_foreach_all(sticker_provider, 0, total_cnt, &result, _delete_all_stickers_cb, (void *)groupName);
     if (ret != STICKER_ERROR_NONE)
-        STLOGE("Failed to retrieve all sticker data. ret : %d", ret);
+        STLOGE("Failed to retrieve all sticker data. error code : 0x%X, message : '%s'", ret, get_error_message(ret));
+
+    return (ret == STICKER_ERROR_NONE);
 }