Modify the log message

- Change the log tag name
- Use the defined log format in dlog.h

Change-Id: Ide13e8d6142fdfbd746eda7a29decdadea928d1f

diff --git a/ug-nfc-setting-efl/include/ug-nfc-setting-main.h b/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
index 6966f61..ef710f4 100644 (file)
--- a/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
+++ b/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
@@ -43,7 +43,7 @@ extern "C" {
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG "UG_NFC_SETTING_EFL"
+#define LOG_TAG "UG_NFC_EFL_SETTING"
 
 #define NFCUG_TEXT_DOMAIN              PACKAGE
 #define NFCUG_LOCALEDIR                LOCALE_PATH

diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-db.c b/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
index 2c298fd..2cce01d 100644 (file)
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
@@ -33,7 +33,7 @@ static sqlite3_stmt *g_predefined_item_pstmt;
 
 static void _db_finalize_statement(void)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
 
@@ -48,13 +48,13 @@ static void _db_finalize_statement(void)
                }
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 
 int _ug_nfc_setting_db_open(void)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
 
@@ -64,14 +64,14 @@ int _ug_nfc_setting_db_open(void)
                LOGD("Failed to open database. error[%d]", db_ret);
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return db_ret;
 }
 
 int _ug_nfc_setting_db_close(void)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
 
@@ -86,14 +86,14 @@ int _ug_nfc_setting_db_close(void)
                g_predefined_item_db = NULL;
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return db_ret;
 }
 
 int _ug_nfc_setting_db_open_table(int *table_handle)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
        int count = 0;
@@ -133,14 +133,14 @@ int _ug_nfc_setting_db_open_table(int *table_handle)
                db_ret = SQLITE_ERROR;
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return db_ret;
 }
 
 int _ug_nfc_setting_db_get_count(int *count)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
        char query[DB_QUERY_LEN] = { 0, };
@@ -170,7 +170,7 @@ int _ug_nfc_setting_db_get_count(int *count)
 
        _db_finalize_statement();
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return db_ret;
 }
@@ -179,7 +179,7 @@ int _ug_nfc_setting_db_get_next_record(int table_handle,
                                        char **app_id, char **pkgName,
                                        char **iconPath, char **msgDes)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
        sqlite3_stmt *stmt = NULL;
@@ -205,14 +205,14 @@ int _ug_nfc_setting_db_get_next_record(int table_handle,
                        *msgDes = strdup((char *)sqlite3_column_text(stmt, 3));
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return SQLITE_OK;
 }
 
 int _ug_nfc_setting_db_get_pkgName(char *app_id, char **pkgName)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
        char query[DB_QUERY_LEN] = { 0, };
@@ -241,14 +241,14 @@ int _ug_nfc_setting_db_get_pkgName(char *app_id, char **pkgName)
 
        _db_finalize_statement();
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return db_ret;
 }
 
 int _ug_nfc_setting_db_close_table(int table_handle)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int db_ret = SQLITE_OK;
        sqlite3_stmt *stmt = NULL;
@@ -263,7 +263,7 @@ int _ug_nfc_setting_db_close_table(int table_handle)
                LOGD("Failed to sqlite3_finalize error[%d]", db_ret);
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return db_ret;
 }

diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
index 59a9024..973098a 100644 (file)
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
@@ -44,17 +44,17 @@ static bool pending_status = false;
 #ifdef MDM_PHASE_2
 static void _mdm_restricted_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
+       LOGD("BEGIN >>>>");
        ugdata_t *ug_data = (ugdata_t *)data;
        if (!ug_data)
                return;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static void _mdm_restricted_popup(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        char popup_str[POPUP_TEXT_SIZE] = { 0, };
        char *buf = NULL;
@@ -66,7 +66,7 @@ static void _mdm_restricted_popup(void *data)
        snprintf(popup_str, POPUP_TEXT_SIZE, buf, IDS_NFC_NFC);
        ug_nfc_setting_create_popup(ug_data, ug_data->base_layout, popup_str, NULL, 0, NULL, 0, NULL, 0, true, true, _mdm_restricted_popup_response_cb);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 #endif
 
@@ -75,7 +75,7 @@ static void _show_app_error_popup_response_cb(void *data, Evas_Object *obj, void
        ugdata_t *ug_data = (ugdata_t *)data;
        int result = (int)event_info;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (ug_data == NULL)
                return;
@@ -92,7 +92,7 @@ static void _show_app_error_popup_response_cb(void *data, Evas_Object *obj, void
                break;
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void _show_app_error_popup(void *data)
@@ -100,7 +100,7 @@ static void _show_app_error_popup(void *data)
        ugdata_t *ug_data = (ugdata_t *)data;
        char popup_str[POPUP_TEXT_SIZE] = { 0, };
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (ug_data == NULL)
                return;
@@ -109,7 +109,7 @@ static void _show_app_error_popup(void *data)
 
        ug_nfc_setting_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_CLOSE, UG_NFC_POPUP_RESP_CLOSE, NULL, 0, NULL, 0, false, false, _show_app_error_popup_response_cb);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static bool _get_pending_status(void)
@@ -124,13 +124,13 @@ static void _set_pending_status(bool status)
 
 static void _back_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        _ug_nfc_setting_db_close();
 
        ug_destroy_me(data);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 /* Principle of NFC, S Beam On/Off                             */
@@ -145,7 +145,7 @@ static void _change_nfc_onoff_setting(void *data)
        int status;
        int result;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        if (!ug_data)
@@ -183,17 +183,17 @@ static void _change_nfc_onoff_setting(void *data)
 
        if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &status)) == 0)
        {
-               LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
+               LOGD("vconf_get_bool status [%d]\n", status);
 
                result = nfc_manager_set_activation(!status, NULL, NULL);
                _set_pending_status(true);
        }
        else
        {
-               LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+               LOGD("vconf_get_bool failed\n");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 #ifdef _SBEAM_SUPPORT_
@@ -202,7 +202,7 @@ static void _change_nfc_sbeam_setting(void *data)
        int status = 0;
        int result = -1;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        if (!ug_data)
@@ -240,7 +240,7 @@ static void _change_nfc_sbeam_setting(void *data)
 
        if ((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &status)) == 0)
        {
-               LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
+               LOGD("vconf_get_bool status [%d]\n", status);
 
                if (status)
                {
@@ -248,11 +248,11 @@ static void _change_nfc_sbeam_setting(void *data)
                        result = vconf_set_bool(VCONFKEY_NFC_SBEAM, FALSE);
                        if (!result )
                        {
-                               LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool success\n");
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool failed\n");
                        }
                }
                else
@@ -261,17 +261,17 @@ static void _change_nfc_sbeam_setting(void *data)
                        result = vconf_set_bool(VCONFKEY_NFC_SBEAM, TRUE);
                        if (!result )
                        {
-                               LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool success\n");
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool failed\n");
                        }
 
                        /* nfc on */
                        if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &status)) == 0)
                        {
-                               LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
+                               LOGD("vconf_get_bool status [%d]\n", status);
                                if (!status)
                                {
                                        result = nfc_manager_set_activation(true, NULL, NULL);
@@ -280,16 +280,16 @@ static void _change_nfc_sbeam_setting(void *data)
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool failed\n");
                        }
                }
        }
        else
        {
-               LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+               LOGD("vconf_get_bool failed\n");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 #endif
 
@@ -298,7 +298,7 @@ void _change_nfc_predefined_item_setting(void *data)
        int status = 0;
        int result = -1;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        if (!ug_data)
@@ -336,7 +336,7 @@ void _change_nfc_predefined_item_setting(void *data)
 
        if ((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &status)) == 0)
        {
-               LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
+               LOGD("vconf_get_bool status [%d]\n", status);
 
                if (status)
                {
@@ -344,11 +344,11 @@ void _change_nfc_predefined_item_setting(void *data)
                        result = vconf_set_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, FALSE);
                        if (!result )
                        {
-                               LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool success\n");
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool failed\n");
                        }
                }
                else
@@ -357,25 +357,25 @@ void _change_nfc_predefined_item_setting(void *data)
                        result = vconf_set_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, TRUE);
                        if (!result )
                        {
-                               LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool success\n");
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool failed\n");
                        }
                }
        }
        else
        {
-               LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+               LOGD("vconf_get_bool failed\n");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 void _nfc_activation_changed_cb(bool activated , void *user_data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)user_data;
        int predefined_item_state = 0;
@@ -387,11 +387,11 @@ void _nfc_activation_changed_cb(bool activated , void *user_data)
 
        if ((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &predefined_item_state)) == 0)
        {
-               LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, predefined_item_state);
+               LOGD("vconf_get_bool status [%d]\n", predefined_item_state);
        }
        else
        {
-               LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+               LOGD("vconf_get_bool failed\n");
                return;
        }
 
@@ -448,7 +448,7 @@ void _nfc_activation_changed_cb(bool activated , void *user_data)
                /* sbeam off */
                if ((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &sbeam_state)) == 0)
                {
-                       LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, sbeam_state);
+                       LOGD("vconf_get_bool status [%d]\n", sbeam_state);
 
                        if (sbeam_state)
                        {
@@ -456,22 +456,22 @@ void _nfc_activation_changed_cb(bool activated , void *user_data)
                                result = vconf_set_bool(VCONFKEY_NFC_SBEAM, FALSE);
                                if (!result )
                                {
-                                       LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+                                       LOGD("vconf_set_bool success\n");
                                }
                                else
                                {
-                                       LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+                                       LOGD("vconf_set_bool failed\n");
                                }
                        }
                }
                else
                {
-                       LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+                       LOGD("vconf_get_bool failed\n");
                }
 #endif
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static Evas_Object *_create_bg(Evas_Object *parent, char *style)
@@ -515,13 +515,13 @@ static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
        Eina_Bool result = EINA_FALSE;
        int enable = 0;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        gl_item_data *item_data = (gl_item_data *)data;
 
        if (item_data == NULL)
        {
-               LOGD("[%s(): %d] item_data is null", __FUNCTION__, __LINE__);
+               LOGD("item_data is null");
                return EINA_FALSE;
        }
 
@@ -531,17 +531,17 @@ static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
                {
                        if (enable != 0)
                        {
-                               LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool true");
                                result = EINA_TRUE;
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool false");
                        }
                }
                else
                {
-                       LOGD("[%s(): %d] vconf_get_bool error [%d]", __FUNCTION__, __LINE__, result);
+                       LOGD("vconf_get_bool error [%d]", result);
                }
        }
 #ifdef _SBEAM_SUPPORT_
@@ -551,17 +551,17 @@ static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
                {
                        if (enable != 0)
                        {
-                               LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool true");
                                result = EINA_TRUE;
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool false");
                        }
                }
                else
                {
-                       LOGD("[%s(): %d] vconf_get_bool error [%d]", __FUNCTION__, __LINE__, result);
+                       LOGD("vconf_get_bool error [%d]", result);
                }
        }
 #endif
@@ -571,25 +571,25 @@ static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
                {
                        if (enable != 0)
                        {
-                               LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool true");
                                result = EINA_TRUE;
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool false");
                        }
                }
                else
                {
-                       LOGD("[%s(): %d] vconf_get_bool error [%d]", __FUNCTION__, __LINE__, result);
+                       LOGD("vconf_get_bool error [%d]", result);
                }
        }
        else
        {
-               LOGD("[%s(): %d] item_data->type error", __FUNCTION__, __LINE__);
+               LOGD("item_data->type error");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return result;
 }
@@ -599,17 +599,17 @@ static void _gl_del(void *data, Evas_Object *obj)
 {
        gl_item_data *item_data = (gl_item_data *)data;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (item_data != NULL)
                free(item_data);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void _gl_sel_activation(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
        gl_item_data *item_data = (gl_item_data *)data;
@@ -618,7 +618,7 @@ static void _gl_sel_activation(void *data, Evas_Object *obj, void *event_info)
 
        if ((item == NULL) || (item_data == NULL))
        {
-               LOGD("[%s(): %d] item or item_data is null\n", __FUNCTION__, __LINE__);
+               LOGD("item or item_data is null\n");
                return;
        }
 
@@ -626,7 +626,7 @@ static void _gl_sel_activation(void *data, Evas_Object *obj, void *event_info)
        {
                if (_get_pending_status())
                {
-                       LOGD("[%s(): %d] pending status \n", __FUNCTION__, __LINE__);
+                       LOGD("pending status \n");
                        return;
                }
 
@@ -648,7 +648,7 @@ static void _gl_sel_activation(void *data, Evas_Object *obj, void *event_info)
                Evas_Object *l_button = NULL;
                ugdata_t *ug_data = item_data->data;
 
-               LOGD("[%s(): %d] NFC_PREDEFINED_ITEM", __FUNCTION__, __LINE__);
+               LOGD("NFC_PREDEFINED_ITEM");
 
                /* create setting view */
                predefined_item_list = _ug_nfc_create_predefined_item_list(ug_data);
@@ -664,21 +664,21 @@ static void _gl_sel_activation(void *data, Evas_Object *obj, void *event_info)
        }
        else
        {
-               LOGD("[%s(): %d] item_data->type error", __FUNCTION__, __LINE__);
+               LOGD("item_data->type error");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        gl_item_data *item_data = (gl_item_data *)data;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (item_data == NULL)
        {
-               LOGD("[%s(): %d] item_data is null\n", __FUNCTION__, __LINE__);
+               LOGD("item_data is null\n");
                return;
        }
 
@@ -686,7 +686,7 @@ static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
        {
                if (_get_pending_status())
                {
-                       LOGD("[%s(): %d] pending status \n", __FUNCTION__, __LINE__);
+                       LOGD("pending status \n");
                        return;
                }
 
@@ -713,15 +713,15 @@ static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
        }
        else
        {
-               LOGD("[%s(): %d] item_data->type error", __FUNCTION__, __LINE__);
+               LOGD("item_data->type error");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *part)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
        Evas_Object *content = NULL;
        int on;
        int result = EINA_FALSE;
@@ -730,14 +730,14 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
        gl_item_data *item_data = (gl_item_data *)data;
        if (item_data == NULL)
        {
-               LOGD("[%s(): %d] item_data is null", __FUNCTION__, __LINE__);
+               LOGD("item_data is null");
                return NULL;
        }
 
        ug_data = item_data->data;
        if (ug_data == NULL)
        {
-               LOGD("[%s(): %d] ug_data is null", __FUNCTION__, __LINE__);
+               LOGD("ug_data is null");
                return NULL;
        }
 
@@ -760,12 +760,12 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
 
                        if (((result = vconf_get_bool(VCONFKEY_NFC_STATE, &on)) == 0) && (on != 0))
                        {
-                               LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool true");
                                elm_check_state_set(content, EINA_TRUE);
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool false");
                                elm_check_state_set(content, EINA_FALSE);
                        }
 
@@ -781,12 +781,12 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
 
                if (((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &on)) == 0) && (on != 0))
                {
-                       LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                       LOGD("vconf_get_bool true");
                        elm_check_state_set(content, EINA_TRUE);
                }
                else
                {
-                       LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                       LOGD("vconf_get_bool false");
                        elm_check_state_set(content, EINA_FALSE);
                }
 
@@ -801,12 +801,12 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
 
                if (((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &on)) == 0) && (on != 0))
                {
-                       LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                       LOGD("vconf_get_bool true");
                        elm_check_state_set(content, EINA_TRUE);
                }
                else
                {
-                       LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                       LOGD("vconf_get_bool false");
                        elm_check_state_set(content, EINA_FALSE);
                }
 
@@ -814,17 +814,17 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
        }
        else
        {
-               LOGD("[%s(): %d] item_data->type error", __FUNCTION__, __LINE__);
+               LOGD("item_data->type error");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return content;
 }
 
 static char *_gl_text_get_onoff(void *data, Evas_Object *obj, const char *part)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        gl_item_data *item_data = (gl_item_data *)data;
        char *text = NULL;
@@ -834,7 +834,7 @@ static char *_gl_text_get_onoff(void *data, Evas_Object *obj, const char *part)
        // label for 'elm.text' part
        if (item_data == NULL)
        {
-               LOGD("[%s(): %d] item_data is null", __FUNCTION__, __LINE__);
+               LOGD("item_data is null");
                return NULL;
        }
 
@@ -870,17 +870,17 @@ static char *_gl_text_get_onoff(void *data, Evas_Object *obj, const char *part)
        }
        else
        {
-               LOGD("[%s(): %d] type error", __FUNCTION__, __LINE__);
+               LOGD("type error");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return text;
 }
 
 static char *_gl_text_get_help(void *data, Evas_Object *obj, const char *part)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int index = (int) data;
        char *text = NULL;
@@ -901,14 +901,14 @@ static char *_gl_text_get_help(void *data, Evas_Object *obj, const char *part)
                text = strdup(IDS_NFC_S_BEAM_DESCRIPTION_MSG);
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return text;
 }
 
 static Evas_Object *_ug_nfc_create_nfc_setting_list(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        Evas_Object *genlist = NULL;
@@ -921,7 +921,7 @@ static Evas_Object *_ug_nfc_create_nfc_setting_list(void *data)
        genlist = elm_genlist_add(ug_data->base_naviframe);
        if (genlist == NULL)
        {
-               LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
+               LOGD("genlist is null");
                return NULL;
        }
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
@@ -1010,11 +1010,11 @@ static Evas_Object *_ug_nfc_create_nfc_setting_list(void *data)
                        result = vconf_set_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, FALSE);
                        if (!result )
                        {
-                               LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool success\n");
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+                               LOGD("vconf_set_bool failed\n");
                        }
                        elm_object_item_disabled_set(predefined_item, EINA_TRUE);
                }
@@ -1022,7 +1022,7 @@ static Evas_Object *_ug_nfc_create_nfc_setting_list(void *data)
 
        evas_object_show(genlist);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return genlist;
 }
@@ -1030,7 +1030,7 @@ static Evas_Object *_ug_nfc_create_nfc_setting_list(void *data)
 #ifdef _SBEAM_SUPPORT_
 static Evas_Object *_ug_nfc_create_sbeam_setting_list(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        Evas_Object *genlist = NULL;
@@ -1041,7 +1041,7 @@ static Evas_Object *_ug_nfc_create_sbeam_setting_list(void *data)
        genlist = elm_genlist_add(ug_data->base_naviframe);
        if (genlist == NULL)
        {
-               LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
+               LOGD("genlist is null");
                return NULL;
        }
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
@@ -1083,7 +1083,7 @@ static Evas_Object *_ug_nfc_create_sbeam_setting_list(void *data)
 
        evas_object_show(genlist);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return genlist;
 }
@@ -1091,7 +1091,7 @@ static Evas_Object *_ug_nfc_create_sbeam_setting_list(void *data)
 
 static void *__ug_nfc_setting_create(ui_gadget_h ug, enum ug_mode mode, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)priv;
        Evas_Object *parent = NULL;
@@ -1183,14 +1183,14 @@ static void *__ug_nfc_setting_create(ui_gadget_h ug, enum ug_mode mode, service_
                LOGD("nfc_manager_initialize FAIL!!!!\n");
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return ug_data->base_layout;
 }
 
 static void __ug_nfc_setting_destroy(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
        ugdata_t *ug_data = (ugdata_t *)priv;
 
        if (ug_data == NULL)
@@ -1205,12 +1205,12 @@ static void __ug_nfc_setting_destroy(ui_gadget_h ug, service_h service, void *pr
 
        evas_object_del(ug_get_layout(ug));
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void __ug_nfc_setting_start(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)priv;
 
@@ -1221,38 +1221,38 @@ static void __ug_nfc_setting_start(ui_gadget_h ug, service_h service, void *priv
                _show_app_error_popup(ug_data);
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void __ug_nfc_setting_pause(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
+       LOGD("END <<<<");
 }
 
 static void __ug_nfc_setting_resume(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
+       LOGD("END <<<<");
 }
 
 static void __ug_nfc_setting_message(ui_gadget_h ug, service_h msg, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
+       LOGD("END <<<<");
 }
 
 static void __ug_nfc_setting_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
+       LOGD("END <<<<");
 }
 
 UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
 {
        ugdata_t *ug_data; // User defined private data
 
-       LOGD("[%s(): %d] UG_MODULE_INIT!!\n", __FUNCTION__, __LINE__);
+       LOGD("UG_MODULE_INIT!!\n");
 
        if (!ops)
                return -1;

diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c b/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c
index 8e918de..9c7115b 100644 (file)
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c
@@ -27,7 +27,7 @@ static void *_user_data = NULL;
 
 static void _ug_nfc_setting_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int btn_type = (int)data;
        UG_NFC_POPUP_USER_RESP_CB temp_cb = _user_response_cb;
@@ -44,28 +44,28 @@ static void _ug_nfc_setting_popup_response_cb(void *data, Evas_Object *obj, void
        if (temp_cb)
                temp_cb(temp_data, obj, (void*)btn_type);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static Eina_Bool _ug_nfc_setting_popup_show_cb(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (_popup)
                evas_object_show(_popup);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 
        return ECORE_CALLBACK_CANCEL;
 }
 
 static void _ug_nfc_setting_popup_block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        _ug_nfc_setting_popup_response_cb((void*)UG_NFC_POPUP_RESP_CLOSE, _popup, NULL);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 Evas_Object *ug_nfc_setting_create_popup(void *data,
@@ -81,7 +81,7 @@ Evas_Object *ug_nfc_setting_create_popup(void *data,
                                     bool enable_timeout,
                                     UG_NFC_POPUP_USER_RESP_CB response_cb)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        Evas_Object *btn = NULL;
 
@@ -136,7 +136,7 @@ Evas_Object *ug_nfc_setting_create_popup(void *data,
 
        _ug_nfc_setting_popup_show_cb(NULL);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 
        return _popup;
 }
@@ -144,7 +144,7 @@ Evas_Object *ug_nfc_setting_create_popup(void *data,
 
 void ug_nfc_setting_close_popup(Evas_Object* popup)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (NULL == popup || NULL == _popup || _popup != popup) {
                LOGD("NULL == popup || NULL == _popup || _popup != popup");
@@ -152,7 +152,7 @@ void ug_nfc_setting_close_popup(Evas_Object* popup)
 
        _ug_nfc_setting_popup_response_cb((void*)UG_NFC_POPUP_RESP_CLOSE, _popup, NULL);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 

diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c b/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
index 11b1431..062ea71 100644 (file)
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
@@ -48,13 +48,13 @@ static int state_index = 0; //selected radio index
 
 static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        _change_nfc_predefined_item_setting(ud);
        if (on_off_item)
                elm_genlist_item_update(on_off_item);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static char *_gl_text_get(void *data, Evas_Object *obj, const char *part)
@@ -124,12 +124,12 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
 
                        if (((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &on)) == 0) && (on != 0))
                        {
-                               LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool true");
                                elm_check_state_set(content, EINA_TRUE);
                        }
                        else
                        {
-                               LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+                               LOGD("vconf_get_bool false");
                                elm_check_state_set(content, EINA_FALSE);
                        }
                        elm_object_style_set(content, "on&off");
@@ -222,11 +222,11 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info)
                                result = vconf_set_str(VCONFKEY_NFC_PREDEFINED_ITEM, item->app_id);
                                if (!result )
                                {
-                                       LOGD("[%s(): %d] vconf_set_str success\n", __FUNCTION__, __LINE__);
+                                       LOGD("vconf_set_str success\n");
                                }
                                else
                                {
-                                       LOGD("[%s(): %d] vconf_set_str failed\n", __FUNCTION__, __LINE__);
+                                       LOGD("vconf_set_str failed\n");
                                }
                        }
                        elm_genlist_item_update(ui_item);
@@ -240,7 +240,7 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info)
 #if 0
 static void _gl_realized(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        int index = 0;
@@ -263,13 +263,13 @@ static void _gl_realized(void *data, Evas_Object *obj, void *event_info)
                }
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 #endif
 
 bool _ug_nfc_check_predefined_item_available(void)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (!_ug_nfc_setting_db_open_table(&dbtable_h))
        {
@@ -281,19 +281,19 @@ bool _ug_nfc_check_predefined_item_available(void)
                return false;
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void __create_predefined_item_data(void)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        predefined_item_data *item = NULL;
        int index;
 
        if (_ug_nfc_setting_db_open_table(&dbtable_h))
        {
-               LOGD("_ug_nfc_setting_db_open_table is failed!!!!!", __FUNCTION__, __LINE__);
+               LOGD("_ug_nfc_setting_db_open_table is failed!!!!!");
                return;
        }
 
@@ -327,12 +327,12 @@ static void __create_predefined_item_data(void)
 
        _ug_nfc_setting_db_close_table(dbtable_h);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void __destroy_predefined_item_data(void)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (predefined_item_list != NULL)
        {
@@ -356,12 +356,12 @@ static void __destroy_predefined_item_data(void)
                g_array_free(predefined_item_list, FALSE);
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 Evas_Object *_ug_nfc_create_predefined_item_list(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        Evas_Object *genlist = NULL;
@@ -373,7 +373,7 @@ Evas_Object *_ug_nfc_create_predefined_item_list(void *data)
        genlist = elm_genlist_add(ug_data->base_naviframe);
        if (genlist == NULL)
        {
-               LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
+               LOGD("genlist is null");
                return NULL;
        }
 #if 0
@@ -425,14 +425,14 @@ Evas_Object *_ug_nfc_create_predefined_item_list(void *data)
 
        ud = ug_data;
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 
        return genlist;
 }
 
 void _ug_nfc_destroy_predefined_item_list(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = data;
 
@@ -448,7 +448,7 @@ void _ug_nfc_destroy_predefined_item_list(void *data, Evas_Object *obj, void *ev
                radio_main = NULL;
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 

diff --git a/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h b/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h
index fa57b4a..1eea6b0 100755 (executable)
--- a/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h
@@ -31,7 +31,7 @@
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG "UG_NFC_SHARE_EFL"
+#define LOG_TAG "UG_SHARE_NFC_EFL"
 
 #define UG_NFC_SHARE_ENABLE_DLOG
 
@@ -39,25 +39,25 @@
 #define UG_NFC_SHARE_DEBUG(fmt, ...)\
        do\
        {\
-               LOGD("[%s(): %d]" fmt, __FUNCTION__, __LINE__,##__VA_ARGS__);\
+               LOGD(fmt,##__VA_ARGS__);\
        } while (0)
 
 #define UG_NFC_SHARE_DEBUG_ERR(fmt, ...)\
        do\
        {\
-               LOGE(COLOR_RED"[%s(): %d]" fmt COLOR_END, __FUNCTION__, __LINE__,##__VA_ARGS__);\
+               LOGE(COLOR_RED fmt COLOR_END,##__VA_ARGS__);\
        }while (0)
 
 #define UG_NFC_SHARE_BEGIN() \
        do\
     {\
-               LOGD(COLOR_BLUE"[%s(): %d] BEGIN >>>>"COLOR_END, __FUNCTION__ ,__LINE__);\
+               LOGD(COLOR_BLUE"BEGIN >>>>"COLOR_END);\
     } while( 0 )
 
 #define UG_NFC_SHARE_END() \
        do\
     {\
-               LOGD(COLOR_BLUE"[%s(): %d] END <<<<"COLOR_END, __FUNCTION__,__LINE__ );\
+               LOGD(COLOR_BLUE"END <<<<"COLOR_END);\
     } \
     while( 0 )
 

diff --git a/ug-nfc-share-efl/include/ug-nfc-share-main.h b/ug-nfc-share-efl/include/ug-nfc-share-main.h
index 033d30a..83c6555 100644 (file)
--- a/ug-nfc-share-efl/include/ug-nfc-share-main.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-main.h
@@ -50,7 +50,7 @@ extern "C" {
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG "UG_NFC_SHARE_EFL"
+#define LOG_TAG "UG_SHARE_NFC_EFL"
 
 #define NFC_SHARE_SERVICE                      "com.samsung.nfc-share-service"
 #define NFC_SHARE_SERVICE_SHARE_VIA_UG         "http://tizen.org/appcontrol/operation/nfc_share_via_ug"

diff --git a/ug-nfc-share-efl/src/ug-nfc-share-main.c b/ug-nfc-share-efl/src/ug-nfc-share-main.c
index 22a3744..75cac26 100644 (file)
--- a/ug-nfc-share-efl/src/ug-nfc-share-main.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-main.c
@@ -81,7 +81,7 @@ const char *_get_font_name(int font)
                        break;
 
                default :
-                       LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
+                       LOGD("unknown font type [%d]", font);
                        break;
                }
        }
@@ -115,7 +115,7 @@ uint32_t _get_font_color(int font)
                        break;
 
                default :
-                       LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
+                       LOGD("unknown font type [%d]", font);
                        break;
                }
        }
@@ -149,7 +149,7 @@ int _get_font_size(int font)
                        break;
 
                default :
-                       LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
+                       LOGD("unknown font type [%d]", font);
                        break;
                }
        }
@@ -183,7 +183,7 @@ const char *_get_font_style(int font)
                        break;
 
                default :
-                       LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
+                       LOGD("unknown font type [%d]", font);
                        break;
                }
        }
@@ -294,18 +294,19 @@ static Evas_Object *_create_main_layout(Evas_Object* parent)
 
 static void _mdm_restricted_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
+
        ugdata_t *ug_data = (ugdata_t *)data;
        ret_if(ug_data == NULL);
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
+       LOGD("END >>>>");
 
        ug_destroy_me(ug_data->nfc_share_ug);
 }
 
 static Eina_Bool _mdm_restricted_popup(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        char popup_str[POPUP_TEXT_SIZE] = { 0, };
        char *buf = NULL;
@@ -316,7 +317,7 @@ static Eina_Bool _mdm_restricted_popup(void *data)
        snprintf(popup_str, POPUP_TEXT_SIZE, buf, IDS_NFC_NFC);
        ug_nfc_share_create_popup(ug_data, ug_data->base_layout, popup_str, NULL, 0, NULL, 0, NULL, 0, true, true, _mdm_restricted_popup_response_cb);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return ECORE_CALLBACK_CANCEL;
 }
@@ -325,14 +326,14 @@ static void _activation_completed_cb(nfc_error_e error, void *user_data)
 {
        ugdata_t *ug_data = (ugdata_t *)user_data;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ret_if(ug_data == NULL);
 
        /* create share view */
        ug_nfc_share_create_nfc_share_view(ug_data);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
@@ -340,7 +341,7 @@ static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, vo
        ugdata_t *ug_data = (ugdata_t *)data;
        int result = (int)event_info;
 
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        ret_if(ug_data == NULL);
 
@@ -348,7 +349,7 @@ static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, vo
        {
        case UG_NFC_POPUP_RESP_OK :
                /* setting is on */
-               LOGD("setting is on >>>>", __FUNCTION__, __LINE__);
+               LOGD("setting is on >>>>");
 
                result = nfc_manager_set_activation(true, _activation_completed_cb, ug_data);
                if (result == NFC_ERROR_SECURITY_RESTRICTED)
@@ -360,7 +361,7 @@ static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, vo
 
        case UG_NFC_POPUP_RESP_CANCEL :
                /* destroy UG */
-               LOGD("ug_destroy_me >>>>", __FUNCTION__, __LINE__);
+               LOGD("ug_destroy_me >>>>");
                ug_destroy_me(ug_data->nfc_share_ug);
                break;
 
@@ -368,7 +369,7 @@ static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, vo
                break;
        }
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static void _setting_on_YesNo_popup(void *data)
@@ -376,7 +377,7 @@ static void _setting_on_YesNo_popup(void *data)
        ugdata_t *ug_data = (ugdata_t *)data;
        char popup_str[POPUP_TEXT_SIZE] = { 0, };
 
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        ret_if(ug_data == NULL);
 
@@ -384,7 +385,7 @@ static void _setting_on_YesNo_popup(void *data)
 
        ug_nfc_share_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_YES, UG_NFC_POPUP_RESP_OK, IDS_NO, UG_NFC_POPUP_RESP_CANCEL, NULL, 0, false, false, _setting_on_YesNo_popup_response_cb);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static void _app_error_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
@@ -392,7 +393,7 @@ static void _app_error_popup_response_cb(void *data, Evas_Object *obj, void *eve
        ugdata_t *ug_data = (ugdata_t *)data;
        int result = (int)event_info;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (ug_data == NULL)
                return;
@@ -401,7 +402,7 @@ static void _app_error_popup_response_cb(void *data, Evas_Object *obj, void *eve
        {
        case UG_NFC_POPUP_RESP_CLOSE :
                /* destroy UG */
-               LOGD("ug_destroy_me >>>>", __FUNCTION__, __LINE__);
+               LOGD("ug_destroy_me >>>>");
                ug_destroy_me(ug_data->nfc_share_ug);
                break;
 
@@ -409,7 +410,7 @@ static void _app_error_popup_response_cb(void *data, Evas_Object *obj, void *eve
                break;
        }
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void _show_app_error_popup(void *data)
@@ -417,7 +418,7 @@ static void _show_app_error_popup(void *data)
        ugdata_t *ug_data = (ugdata_t *)data;
        char popup_str[POPUP_TEXT_SIZE] = { 0, };
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (ug_data == NULL)
                return;
@@ -426,17 +427,17 @@ static void _show_app_error_popup(void *data)
 
        ug_nfc_share_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_CLOSE, UG_NFC_POPUP_RESP_CLOSE, NULL, 0, NULL, 0, false, false, _app_error_popup_response_cb);
 
-       LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+       LOGD("END <<<<");
 }
 
 static void _back_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        /* destroy UG */
        ug_destroy_me(data);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static Evas_Object *ug_nfc_share_create_layout(void *data)
@@ -447,7 +448,7 @@ static Evas_Object *ug_nfc_share_create_layout(void *data)
        Evas_Object *cancel_btn = NULL;
        int width, height;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ecore_x_window_size_get(ecore_x_window_root_first_get(), &width, &height);
        LOGD("width[%d] / height[%d]\n", width, height);
@@ -510,7 +511,7 @@ void ug_nfc_share_create_base_view(void *user_data)
 {
        ugdata_t* ug_data = (ugdata_t*)user_data;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        /* create base layout */
        ug_data->base_layout = _create_main_layout(ug_data->ug_win_main);
@@ -518,7 +519,7 @@ void ug_nfc_share_create_base_view(void *user_data)
        elm_object_part_content_set(ug_data->base_layout, "elm.swallow.bg", ug_data->bg);
        evas_object_show(ug_data->base_layout);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 void ug_nfc_share_create_nfc_share_view(void *user_data)
@@ -526,7 +527,7 @@ void ug_nfc_share_create_nfc_share_view(void *user_data)
        ugdata_t* ug_data = (ugdata_t*)user_data;
        Evas_Object* nfc_share_layout = NULL;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
 
        /* create data */
@@ -543,7 +544,7 @@ void ug_nfc_share_create_nfc_share_view(void *user_data)
 
        elm_object_part_content_set(ug_data->base_layout, "elm.swallow.content", nfc_share_layout);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 bool ug_nfc_share_check_nfc_isAvailable(void *user_data)
@@ -551,14 +552,14 @@ bool ug_nfc_share_check_nfc_isAvailable(void *user_data)
        ugdata_t *ug_data = (ugdata_t *)user_data;
        int result, on;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        retv_if(ug_data == NULL, false);
 
        /* check if nfc is on */
        if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &on)) == 0)
        {
-               LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, on);
+               LOGD("vconf_get_bool status [%d]\n", on);
                if (!on)
                {
                        /* show nfc on/off popup */
@@ -568,11 +569,11 @@ bool ug_nfc_share_check_nfc_isAvailable(void *user_data)
        }
        else
        {
-               LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+               LOGD("vconf_get_bool failed\n");
                return false;
        }
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return true;
 }
@@ -582,7 +583,7 @@ static void ug_nfc_share_create_data(ugdata_t* ug_data)
        bundle *bd = ug_data->bd;
        int type;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int result = UG_NFC_SHARE_ERROR;
        nfc_ndef_message_h msg = NULL;
@@ -692,7 +693,7 @@ static void ug_nfc_share_create_data(ugdata_t* ug_data)
                nfc_ndef_message_destroy(msg);
        }
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static bool ug_nfc_share_parse_bundle(bundle *bd)
@@ -700,7 +701,7 @@ static bool ug_nfc_share_parse_bundle(bundle *bd)
        char *request_type = (char *)bundle_get_val(bd, "request_type");
        char *request_data = (char *)bundle_get_val(bd, "request_data");
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (request_type == NULL || request_data == NULL)
        {
@@ -741,7 +742,7 @@ static bool ug_nfc_share_parse_bundle(bundle *bd)
                return false;
        }
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return true;
 }
@@ -750,7 +751,7 @@ static void *__ug_nfc_share_create(ui_gadget_h ug, enum ug_mode mode, service_h
 {
        ugdata_t *ug_data = (ugdata_t *)priv;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        /* set text domain */
        bindtextdomain(NFCUG_TEXT_DOMAIN, NFCUG_LOCALEDIR);
@@ -789,7 +790,7 @@ static void *__ug_nfc_share_create(ui_gadget_h ug, enum ug_mode mode, service_h
        /* create share view */
        ug_nfc_share_create_nfc_share_view(ug_data);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return ug_data->base_layout;
 }
@@ -798,7 +799,7 @@ static void __ug_nfc_share_destroy(ui_gadget_h ug, service_h service, void *priv
 {
        ugdata_t *ug_data = (ugdata_t *)priv;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (ug_data == NULL)
                return;
@@ -809,7 +810,7 @@ static void __ug_nfc_share_destroy(ui_gadget_h ug, service_h service, void *priv
        /* nfc deactivate */
        if (nfc_manager_deinitialize() != NFC_ERROR_NONE)
        {
-               LOGD("nfc_manager_deinitialize failed", __FUNCTION__, __LINE__);
+               LOGD("nfc_manager_deinitialize failed");
        }
 
        if (ug_data->bd != NULL)
@@ -820,12 +821,12 @@ static void __ug_nfc_share_destroy(ui_gadget_h ug, service_h service, void *priv
 
        evas_object_del(ug_get_layout(ug));
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static void __ug_nfc_share_start(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)priv;
 
@@ -839,33 +840,33 @@ static void __ug_nfc_share_start(ui_gadget_h ug, service_h service, void *priv)
 
        ug_nfc_share_check_nfc_isAvailable(ug_data);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static void __ug_nfc_share_pause(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static void __ug_nfc_share_resume(ui_gadget_h ug, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static void __ug_nfc_share_message(ui_gadget_h ug, service_h msg, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 static void __ug_nfc_share_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)priv;
 
@@ -904,14 +905,14 @@ static void __ug_nfc_share_event(ui_gadget_h ug, enum ug_event event, service_h
                break;
        }
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 }
 
 UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
 {
        ugdata_t *ug_data; // User defined private data
 
-       LOGD("[%s(): %d] UG_MODULE_INIT!!\n", __FUNCTION__, __LINE__);
+       LOGD("UG_MODULE_INIT!!\n");
 
        if (!ops)
                return -1;

diff --git a/ug-nfc-share-efl/src/ug-nfc-share-popup.c b/ug-nfc-share-efl/src/ug-nfc-share-popup.c
index 288f4c8..b2a2280 100644 (file)
--- a/ug-nfc-share-efl/src/ug-nfc-share-popup.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-popup.c
@@ -28,7 +28,7 @@ static void *_user_data = NULL;
 
 static void _ug_nfc_share_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        int btn_type = (int)data;
        UG_NFC_POPUP_USER_RESP_CB temp_cb = _user_response_cb;
@@ -45,28 +45,28 @@ static void _ug_nfc_share_popup_response_cb(void *data, Evas_Object *obj, void *
        if (temp_cb)
                temp_cb(temp_data, obj, (void*)btn_type);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static Eina_Bool _ug_nfc_share_popup_show_cb(void *data)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (_popup)
                evas_object_show(_popup);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 
        return ECORE_CALLBACK_CANCEL;
 }
 
 static void _ug_nfc_share_popup_block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        _ug_nfc_share_popup_response_cb((void*)UG_NFC_POPUP_RESP_CLOSE, _popup, NULL);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 Evas_Object *ug_nfc_share_create_popup(void *data,
@@ -82,7 +82,7 @@ Evas_Object *ug_nfc_share_create_popup(void *data,
                                     bool enable_timeout,
                                     UG_NFC_POPUP_USER_RESP_CB response_cb)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        Evas_Object *btn = NULL;
 
@@ -136,7 +136,7 @@ Evas_Object *ug_nfc_share_create_popup(void *data,
 
        _ug_nfc_share_popup_show_cb(NULL);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 
        return _popup;
 }
@@ -144,7 +144,7 @@ Evas_Object *ug_nfc_share_create_popup(void *data,
 
 void ug_nfc_share_close_popup(Evas_Object* popup)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        if (NULL == popup || NULL == _popup || _popup != popup) {
                LOGD("NULL == popup || NULL == _popup || _popup != popup");
@@ -152,7 +152,7 @@ void ug_nfc_share_close_popup(Evas_Object* popup)
 
        _ug_nfc_share_popup_response_cb((void*)UG_NFC_POPUP_RESP_CLOSE, _popup, NULL);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 

diff --git a/ug-nfc-share-efl/src/ug-nfc-share-tag.c b/ug-nfc-share-efl/src/ug-nfc-share-tag.c
index 00f9baf..4947215 100644 (file)
--- a/ug-nfc-share-efl/src/ug-nfc-share-tag.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-tag.c
@@ -44,7 +44,7 @@ static void _show_status_text(void *data, char *text)
 {
        ugdata_t *ug_data = (ugdata_t *)data;
 
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        ret_if(ug_data == NULL);
        ret_if(text == NULL);
@@ -53,7 +53,7 @@ static void _show_status_text(void *data, char *text)
 
        ug_destroy_me(ug_data->nfc_share_ug);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 ug_nfc_share_tag_type ug_nfc_share_get_tag_type(void)
@@ -73,23 +73,23 @@ nfc_ndef_message_h ug_nfc_share_get_current_ndef(void *data)
 {
        ugdata_t *ug_data = (ugdata_t *)data;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        retv_if(ug_data == NULL, NULL);
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return ug_data->current_ndef;
 }
 
 ug_nfc_share_result_e ug_nfc_share_set_current_ndef(void *data, nfc_ndef_message_h ndef_msg)
 {
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        ugdata_t *ug_data = (ugdata_t *)data;
        if (ug_data == NULL)
        {
-               LOGD("[%s(): %d] ug_data is null", __FUNCTION__, __LINE__);
+               LOGD("ug_data is null");
                return UG_NFC_SHARE_ERROR;
        }
 
@@ -102,7 +102,7 @@ ug_nfc_share_result_e ug_nfc_share_set_current_ndef(void *data, nfc_ndef_message
        }
 
        ug_data->current_ndef = ndef_msg;
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return UG_NFC_SHARE_OK;
 
@@ -113,7 +113,7 @@ static ug_nfc_share_result_e ug_nfc_share_make_mime_type_data_from_file_path(con
        ug_nfc_share_result_e result = UG_NFC_SHARE_ERROR;
        char *extension = NULL;
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        retv_if(path == NULL, result);
        retv_if(type_data == NULL, result);
@@ -148,7 +148,7 @@ static ug_nfc_share_result_e ug_nfc_share_make_mime_type_data_from_file_path(con
 
        LOGD("mime type : %s", GET_SAFE_STRING((char *)type_data));
 
-       LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+       LOGD("END >>>>");
 
        return result;
 }
@@ -166,7 +166,7 @@ ug_nfc_share_result_e ug_nfc_share_make_ndef_message_from_file(nfc_ndef_message_
        long int file_len = 0;
 
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        retv_if(msg == NULL, result);
        retv_if(path == NULL, result);
@@ -269,7 +269,7 @@ ug_nfc_share_result_e ug_nfc_share_make_ndef_message_from_file(nfc_ndef_message_
 
        LOGD("ug_nfc_share_make_ndef_message_from_file success");
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 
        return result;
 }
@@ -289,7 +289,7 @@ ug_nfc_share_result_e ug_nfc_share_make_ndef_message_from_multi_file(nfc_ndef_me
        int index;
 
 
-       LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN >>>>");
 
        retv_if(msg == NULL, result);
        retv_if(path == NULL, result);
@@ -396,7 +396,7 @@ ug_nfc_share_result_e ug_nfc_share_make_ndef_message_from_multi_file(nfc_ndef_me
 
                LOGD("ug_nfc_share_make_ndef_message_from_file success");
 
-               LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+               LOGD("END>>>>");
        }
        return result;
 }
@@ -434,7 +434,7 @@ void _ug_nfc_share_get_bt_addr_from_string(uint8_t *addr, char *addr_string)
 
 static void _p2p_connection_handover_completed_cb(nfc_error_e result, nfc_ac_type_e carrior, void *ac_data, int ac_data_size, void *user_data)
 {
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        ugdata_t* ug_data = (ugdata_t*)user_data;
 
@@ -444,7 +444,7 @@ static void _p2p_connection_handover_completed_cb(nfc_error_e result, nfc_ac_typ
        /* nfc deactivate */
        if(nfc_manager_deinitialize () != NFC_ERROR_NONE)
        {
-               LOGD("nfc_manager_deinitialize failed", __FUNCTION__, __LINE__);
+               LOGD("nfc_manager_deinitialize failed");
        }
 
        if(result == NFC_ERROR_NONE)
@@ -480,12 +480,12 @@ static void _p2p_connection_handover_completed_cb(nfc_error_e result, nfc_ac_typ
                _show_status_text(ug_data, IDS_UNABLE_TO_SHARE);
        }
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static void _p2p_send_completed_cb(nfc_error_e result, void *user_data)
 {
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        ugdata_t* ug_data = (ugdata_t*)user_data;
 
@@ -495,7 +495,7 @@ static void _p2p_send_completed_cb(nfc_error_e result, void *user_data)
        /* nfc deactivate */
        if(nfc_manager_deinitialize () != NFC_ERROR_NONE)
        {
-               LOGD("nfc_manager_deinitialize failed", __FUNCTION__, __LINE__);
+               LOGD("nfc_manager_deinitialize failed");
        }
 
        if(result == NFC_ERROR_NONE)
@@ -511,12 +511,12 @@ static void _p2p_send_completed_cb(nfc_error_e result, void *user_data)
                _show_status_text(ug_data, IDS_UNABLE_TO_SHARE);
        }
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 static void _p2p_target_discovered_cb(nfc_discovered_type_e type, nfc_p2p_target_h target, void *user_data)
 {
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        ugdata_t* ug_data = (ugdata_t*)user_data;
 
@@ -562,25 +562,25 @@ static void _p2p_target_discovered_cb(nfc_discovered_type_e type, nfc_p2p_target
                LOGD("NFC_DISCOVERED_TYPE_DETACHED");
        }
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 void ug_nfc_set_nfc_callback(void *user_data)
 {
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        nfc_manager_set_p2p_target_discovered_cb(_p2p_target_discovered_cb, user_data);
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 void ug_nfc_unset_nfc_callback(void)
 {
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        nfc_manager_unset_p2p_target_discovered_cb();
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 }
 
 int _bt_ipc_send_obex_message(uint8_t *address, const uint8_t *files, uint32_t length)
@@ -589,7 +589,7 @@ int _bt_ipc_send_obex_message(uint8_t *address, const uint8_t *files, uint32_t l
        uint32_t i, count = 1;
        E_DBus_Connection *conn = NULL;
 
-       LOGD("[%s(): %d] BEGIN>>>>", __FUNCTION__, __LINE__);
+       LOGD("BEGIN>>>>");
 
        if (address == NULL || files == NULL)
        {
@@ -672,7 +672,7 @@ int _bt_ipc_send_obex_message(uint8_t *address, const uint8_t *files, uint32_t l
                result = -1;
        }
 
-       LOGD("[%s(): %d] END>>>>", __FUNCTION__, __LINE__);
+       LOGD("END>>>>");
 
        return result;
 }