From: Sung-Jin Park Date: Wed, 6 May 2020 05:19:20 +0000 (+0900) Subject: e_service_launcher: fix logs not to use __FUNCTION__ macro X-Git-Tag: submit/tizen_5.5/20200506.112709~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb01d66c98551abed9f2975bca6d3f26fabaff0c;p=platform%2Fupstream%2Fenlightenment.git e_service_launcher: fix logs not to use __FUNCTION__ macro Change-Id: I24633d0dc6e057784ba87c3c498fb352b6604d21 Signed-off-by: Sung-Jin Park --- diff --git a/src/bin/services/e_service_launcher.c b/src/bin/services/e_service_launcher.c index 446b0734ec..08313dad0c 100644 --- a/src/bin/services/e_service_launcher.c +++ b/src/bin/services/e_service_launcher.c @@ -289,10 +289,10 @@ _launcher_post_backward(E_Service_Launcher *lc, Eina_Bool success) res = _launcher_handler_launchee_del_with_launcher(lc); if (res) - ELOGF("LAUNCHER_SRV", "[%s] SUCCEED to delete launcher : %p from launchee_hash ! target.ec : %p", - NULL, __FUNCTION__, lc, lc->target.ec ? lc->target.ec : NULL); + ELOGF("LAUNCHER_SRV", "[POST FORWARD] SUCCEED to delete launcher : %p from launchee_hash ! target.ec : %p", + NULL, lc, lc->target.ec ? lc->target.ec : NULL); else - ELOGF("LAUNCHER_SRV", "[%s] FAILED to delete launcher : %p from launchee_hash !", NULL, __FUNCTION__, lc); + ELOGF("LAUNCHER_SRV", "[POST FORWARD] FAILED to delete launcher : %p from launchee_hash !", NULL, lc); if (!target_ec) return; @@ -1322,9 +1322,9 @@ _launcher_handler_launcher_find_with_launchee(E_Client *ec) lc = (E_Service_Launcher *)eina_hash_find(_laundler->launchee_hash, &ec); if (lc) - ELOGF("LAUNCHER_SRV", "[%s] Found launcher : %p, launched_ec : %p, _laundler->launchee_count : %d", ec, __FUNCTION__, lc, lc->launched_ec, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Found launcher : %p, launched_ec : %p, _laundler->launchee_count : %d", ec, lc, lc->launched_ec, _laundler->launchee_count); else - ELOGF("LAUNCHER_SRV", "[%s] No launcher found. _laundler->launchee_count : %d", ec, __FUNCTION__, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "No launcher found. _laundler->launchee_count : %d", ec, _laundler->launchee_count); return lc; } @@ -1344,9 +1344,9 @@ _launcher_handler_launchee_add_with_launcher(E_Service_Launcher *lc) _laundler->launchee_count++; if (ret) - ELOGF("LAUNCHER_SRV", "[%s] Added launchee : %p, launcher : %p, _laundler->launchee_count : %d", lc->ec, __FUNCTION__, lc->launched_ec, lc, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Added launchee : %p, launcher : %p, _laundler->launchee_count : %d", lc->ec, lc->launched_ec, lc, _laundler->launchee_count); else - ELOGF("LAUNCHER_SRV", "[%s] Unable to add launchee : %p, launcher : %p, _laundler->launchee_count : %d", lc->ec, __FUNCTION__, lc->launched_ec, lc, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Unable to add launchee : %p, launcher : %p, _laundler->launchee_count : %d", lc->ec, lc->launched_ec, lc, _laundler->launchee_count); return ret; } @@ -1364,9 +1364,9 @@ _launcher_handler_launchee_del_with_launcher(E_Service_Launcher *lc) if (ret) _laundler->launchee_count--; if (ret) - ELOGF("LAUNCHER_SRV", "[%s] Deleted launchee : %p, launcher : %p, _laundler->launchee_count : %d", NULL, __FUNCTION__, lc->launched_ec, lc, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Deleted launchee : %p, launcher : %p, _laundler->launchee_count : %d", NULL, lc->launched_ec, lc, _laundler->launchee_count); else - ELOGF("LAUNCHER_SRV", "[%s] Unable to delete launchee : %p, launcher : %p, _laundler->launchee_count : %d", NULL, __FUNCTION__, lc->launched_ec, lc, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Unable to delete launchee : %p, launcher : %p, _laundler->launchee_count : %d", NULL, lc->launched_ec, lc, _laundler->launchee_count); return ret; } @@ -1390,9 +1390,9 @@ _launcher_handler_launchee_del(E_Client *ec) _laundler->launchee_count--; if (ret) - ELOGF("LAUNCHER_SRV", "[%s] Deleted launchee : %p, launcher : %p, _laundler->launchee_count : %d", ec, __FUNCTION__, ec, lc, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Deleted launchee : %p, launcher : %p, _laundler->launchee_count : %d", ec, ec, lc, _laundler->launchee_count); else - ELOGF("LAUNCHER_SRV", "[%s] Unable to delete launchee : %p, _laundler->launchee_count : %d", ec, __FUNCTION__, ec, _laundler->launchee_count); + ELOGF("LAUNCHER_SRV", "Unable to delete launchee : %p, _laundler->launchee_count : %d", ec, ec, _laundler->launchee_count); return ret; } @@ -1627,8 +1627,8 @@ _launcher_handler_cb_hook_vis_lower(void *data EINA_UNUSED, E_Client *ec) */ lc = _launcher_handler_launcher_find_with_launchee(activity); - if (lc) ELOGF("LAUNCHER_SRV", "[%s] Found launcher : %p, activity : %p, lc->ec : %p, lc->launched_ec : %p", - activity, __FUNCTION__, lc, activity, lc->ec, lc->launched_ec); + if (lc) ELOGF("LAUNCHER_SRV", "[VIS_LOWER] Found launcher : %p, activity : %p, lc->ec : %p, lc->launched_ec : %p", + activity, lc, activity, lc->ec, lc->launched_ec); } EINA_SAFETY_ON_NULL_RETURN_VAL(lc, EINA_FALSE);