get rid of unused e_pixmap parameter of ELOG

Change-Id: I918a96e5d0a50f46d3d35613d811c07a37f29114

diff --git a/packaging/e-mod-tizen-effect.spec b/packaging/e-mod-tizen-effect.spec
index e402907..fdb9597 100644 (file)
--- a/packaging/e-mod-tizen-effect.spec
+++ b/packaging/e-mod-tizen-effect.spec
@@ -29,7 +29,7 @@ as one module of enlightenment.
 %build
 
 export GC_SECTIONS_FLAGS="-fdata-sections -ffunction-sections -Wl,--gc-sections"
-export CFLAGS+=" -Wall -Werror-implicit-function-declaration -g -fPIC -rdynamic ${GC_SECTIONS_FLAGS} -DE_LOGGING=1"
+export CFLAGS+=" -Wall -Werror-implicit-function-declaration -g -fPIC -rdynamic ${GC_SECTIONS_FLAGS} -DE_LOGGING=2"
 export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
 
 %autogen

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index 74d4cff..07da8e6 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -165,7 +165,7 @@ _eff_object_underlayer_get(E_Client *ec)
              evas_object_show(img);
 
              EFFDBG("Video Object Created img(%p) %d,%d %dx%d underlay(%p)",
-                    ec->pixmap, ec,
+                    ec,
                     img, info.dst_pos.x, info.dst_pos.y, info.dst_pos.w, info.dst_pos.h,
                     underlay);
           }
@@ -213,7 +213,7 @@ _eff_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
      }
 
    EFFINF("SEND %.5s|type:%d|win:0x%08x|tz_effect:0x%08x",
-          ec->pixmap, ec,
+          ec,
           start ? "START" : "END", type,
           (unsigned int)e_client_util_win_get(ec),
           (unsigned int)res_eff);
@@ -224,15 +224,15 @@ _eff_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
      {
         tizen_effect_send_end(res_eff, res_surf, tizen_effect_type);
 
-        EFFINF("Un-SET EXTRA_ANIMATING...", ec->pixmap, ec);
+        EFFINF("Un-SET EXTRA_ANIMATING...", ec);
         ec->extra_animating = EINA_FALSE;
         if (ec->launching == EINA_TRUE)
           {
-             ELOGF("COMP", "Un-Set launching flag..", ec->pixmap, ec);
+             ELOGF("COMP", "Un-Set launching flag..", ec);
              ec->launching = EINA_FALSE;
              if (ec->first_mapped)
                {
-                  ELOGF("LAUNCH", "SHOW real win", ec->pixmap, ec);
+                  ELOGF("LAUNCH", "SHOW real win", ec);
                   e_comp_object_signal_emit(ec->frame, "e,action,launch_real,done", "e");
                }
              e_comp_object_signal_emit(ec->frame, "e,action,launch,done", "e");
@@ -358,7 +358,7 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group)
           e_comp_object_effect_set(ec->frame, "no-effect");
 
         EFFINF("eff Setup efc(%p) home(%d) type(%d) parent(%d)",
-               ec->pixmap, ec, efc,
+               ec, efc,
                efc? e_policy_client_is_home_screen(efc->reverse_ec) : 0,
                ec->effect_type,
                parent_ec == ec ? -1 : parent_ec->launching);
@@ -632,7 +632,7 @@ _eff_object_background_setup(E_Client *ec, E_Client *home_ec, E_Effect_Group gro
           {
              if (first)
                {
-                  EFFDBG("make bottom most background to be opaque", bg_ec->pixmap, bg_ec);
+                  EFFDBG("make bottom most background to be opaque", bg_ec);
                   _eff_object_background_start(bg_ec, type, 1);
                   first = 0;
                }
@@ -679,7 +679,7 @@ _eff_pending_effect_start(void)
    if (!ec) return;
 
    EFFINF("Pending eff Start type(%d)",
-          ec->pixmap, ec, _eff->next_done.type);
+          ec, _eff->next_done.type);
 
    if (_eff->next_done.cb)
      {
@@ -698,7 +698,7 @@ _eff_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, Edje_Signa
    _eff_pending_effect_start();
 
    EFFINF("Pending eff Set type(%d)",
-          ec->pixmap, ec, type);
+          ec, type);
 
    _eff->next_done.cb = done_cb;
    _eff->next_done.ec = ec;
@@ -812,7 +812,7 @@ _eff_restack_effect_check(E_Client *ec)
 
    EFFINF("Restack eff Check v1(%d) -> v2(%d) iconic:%d "
           "obscured:%d(%d) emission:%s",
-          ec->pixmap, ec,
+          ec,
           v1, v2, ec->iconic,
           ec->visibility.obscured, ec->visibility.changed, emission);
 
@@ -856,7 +856,7 @@ _eff_ref(E_Client *ec)
    efc->ep = e_pixmap_ref(ec->pixmap);
 
    EFFINF("effect ref efc(%p) animating:%d",
-          efc->ep, efc->ec, efc, efc->animating);
+          efc->ec, efc, efc->animating);
 
    return EINA_TRUE;
 }
@@ -891,7 +891,7 @@ _eff_unref(E_Client *ec)
         if (!e_object_unref(E_OBJECT(ec)))
           {
              EFFINF("eff unref ec(%p) ep(%p) efc(%p) Client free'd",
-                    NULL, NULL, ec, efc->ep, efc);
+                    NULL, ec, efc->ep, efc);
 
              efc->ec = NULL;
              efc = NULL;
@@ -902,7 +902,7 @@ _eff_unref(E_Client *ec)
      }
 
    EFFINF("eff Unref efc(%p) animating:%d",
-          ec->pixmap, ec, efc, efc->animating);
+          ec, efc, efc->animating);
 
    /* The reference count of wl_buffer will get decremented
     * immediately after window effect.
@@ -951,7 +951,7 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal)
    _eff_stack_update();
    e_comp_override_add();
 
-   EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec);
+   EFFINF("SET EXTRA_ANIMATING...", ec);
    ec->extra_animating = EINA_TRUE;
 
    _eff_object_setup(ec, group);
@@ -1115,7 +1115,7 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
         EFFINF("Uniconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
-               ec->pixmap, ec,
+               ec,
                v1, v2, ec->visibility.obscured, ec->visibility.changed);
 
         if (v1 == v2) return EINA_FALSE;
@@ -1139,7 +1139,7 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
 
         EFFINF("Uniconify HOME group do hide eff of %p",
-               ec->pixmap, ec, below);
+               ec, below);
 
         e_comp_object_signal_emit(below->frame, "e,action,restack,hide", "e");
         return EINA_TRUE;
@@ -1152,7 +1152,7 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
         EFFINF("Uniconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
-               ec->pixmap, ec,
+               ec,
                v1, v2, ec->visibility.obscured, ec->visibility.changed);
 
         if (v1 == v2) return EINA_FALSE;
@@ -1228,7 +1228,7 @@ _eff_cb_iconify(void *data, Evas_Object *obj, const char *signal)
    v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
    EFFINF("Iconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
-          ec->pixmap, ec,
+          ec,
           v1, v2, ec->visibility.obscured, ec->visibility.changed);
 
    if (v1 == v2) return EINA_FALSE;
@@ -1316,11 +1316,11 @@ _eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const
                   ec_home->extra_animating = EINA_FALSE;
                   if (ec_home->launching == EINA_TRUE)
                     {
-                       ELOGF("COMP", "Un-Set launching flag..", ec_home->pixmap, ec_home);
+                       ELOGF("COMP", "Un-Set launching flag..", ec_home);
                        ec_home->launching = EINA_FALSE;
                        if (ec_home->first_mapped)
                          {
-                            ELOGF("LAUNCH", "SHOW real win", ec_home->pixmap, ec_home);
+                            ELOGF("LAUNCH", "SHOW real win", ec_home);
                             e_comp_object_signal_emit(ec_home->frame, "e,action,launch_real,done", "e");
                          }
 
@@ -1398,7 +1398,7 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
           }
         if (!_eff_ref(ec)) return EINA_FALSE;
 
-        EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec);
+        EFFINF("SET EXTRA_ANIMATING...", ec);
         ec->extra_animating = EINA_TRUE;
 
         e_comp_override_add();
@@ -1441,12 +1441,12 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
                {
                   if (_eff_ref(ec_home))
                     {
-                       EFFINF("SET EXTRA_ANIMATING...", ec_home->pixmap, ec_home);
+                       EFFINF("SET EXTRA_ANIMATING...", ec_home);
                        ec_home->extra_animating = EINA_TRUE;
 
                        efc->reverse_ec = ec_home;
 
-                       EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec);
+                       EFFINF("SET EXTRA_ANIMATING...", ec);
                        ec->extra_animating = EINA_TRUE;
                     }
                }
@@ -1527,7 +1527,7 @@ _eff_cb_launch(void *data, Evas_Object *obj, const char *signal)
    if (!res_eff) return EINA_FALSE;
 
    EFFINF("SEND END  |type:LAUNCH|win:0x%08x|tz_effect:0x%08x",
-          ec->pixmap, ec,
+          ec,
           (unsigned int)e_client_util_win_get(ec),
           (unsigned int)res_eff);
 
@@ -1587,7 +1587,7 @@ _eff_cb_client_restack(void *data, int type, void *event)
    if (!ec) return ECORE_CALLBACK_PASS_ON;
    if (e_object_is_del(E_OBJECT(ec))) return ECORE_CALLBACK_PASS_ON;
 
-   EFFINF("Client restacked", ec->pixmap, ec);
+   EFFINF("Client restacked", ec);
 
    _eff_stack_update();
 

diff --git a/src/e_mod_effect.h b/src/e_mod_effect.h
index 8044dc1..e7b8816 100644 (file)
--- a/src/e_mod_effect.h
+++ b/src/e_mod_effect.h
@@ -4,17 +4,16 @@
 # include <e.h>
 # include <tizen-extension-server-protocol.h>
 
-#define EFFINF(f, cp, ec, x...) ELOGF("EFFECT", f, cp, ec, ##x)
-#define EFFDBG(f, cp, ec, x...)                            \
+#define EFFINF(f, ec, x...) ELOGF("EFFECT", f, ec, ##x)
+#define EFFDBG(f, ec, x...)                                \
    do                                                      \
      {                                                     \
-        if ((!cp) && (!ec))                                \
+        if ((!ec))                                         \
           DBG("EWL|%20.20s|             |             |"f, \
-              "EFFECT", ##x);                                   \
+              "EFFECT", ##x);                              \
         else                                               \
-          DBG("EWL|%20.20s|cp:0x%08x|ec:0x%08x|"f,         \
-              "EFFECT",                                         \
-              (unsigned int)(cp),                          \
+          DBG("EWL|%20.20s|             |ec:0x%08x|"f,     \
+              "EFFECT",                                    \
               (unsigned int)(ec),                          \
               ##x);                                        \
      }                                                     \

diff --git a/src/e_mod_effect_rotation.c b/src/e_mod_effect_rotation.c
index 7913edf..889cb3c 100644 (file)
--- a/src/e_mod_effect_rotation.c
+++ b/src/e_mod_effect_rotation.c
@@ -86,7 +86,7 @@ _rotation_effect_ready_send(E_Zone *zone)
    ev->zone = zone;
    ecore_event_add(E_EVENT_ZONE_ROTATION_EFFECT_READY, ev, _rotation_effect_event_free, NULL);
 
-   EFFINF("Rotation Effect Event Ready", NULL, NULL);
+   EFFINF("Rotation Effect Event Ready", NULL);
 }
 
 static void
@@ -100,7 +100,7 @@ _rotation_effect_cancel_send(E_Zone *zone)
    ev->zone = zone;
    ecore_event_add(E_EVENT_ZONE_ROTATION_EFFECT_CANCEL, ev, _rotation_effect_event_free, NULL);
 
-   EFFINF("Rotation Effect Event Cancel", NULL, NULL);
+   EFFINF("Rotation Effect Event Cancel", NULL);
 }
 
 static void
@@ -114,7 +114,7 @@ _rotation_effect_done_send(E_Zone *zone)
    ev->zone = zone;
    ecore_event_add(E_EVENT_ZONE_ROTATION_EFFECT_DONE, ev, _rotation_effect_event_free, NULL);
 
-   EFFINF("Rotation Effect Event Done", NULL, NULL);
+   EFFINF("Rotation Effect Event Done", NULL);
 }
 
 static Eina_Bool
@@ -453,7 +453,7 @@ _rotation_effect_object_create(Evas_Object *o)
           goto fail;
 
         EFFINF("Rotation EFFECT Object Created E_Client:%p",
-               NULL, NULL, ec);
+               NULL, ec);
 
         eobj->img = img;
         return eobj;
@@ -483,7 +483,7 @@ _rotation_effect_object_create(Evas_Object *o)
         eobj->img = img;
 
         EFFINF("Rotation EFFECT Object Created Object:%p",
-               NULL, NULL, o);
+               NULL, o);
 
         return eobj;
      }
@@ -555,7 +555,7 @@ _rotation_effect_begin_create(Rotation_Effect *effect, Eina_List *targets, E_Des
 
    e_desk_smart_member_add(desk, ctx_begin->layout);
 
-   EFFINF("Rotation Begin Created", NULL, NULL);
+   EFFINF("Rotation Begin Created", NULL);
 
    int diff = effect->zone->rot.prev - effect->zone->rot.curr;
    if (diff == 270) diff = - 90;
@@ -614,7 +614,7 @@ _rotation_effect_end_create(Rotation_Effect *effect, Eina_List *targets, E_Desk
 
    e_desk_smart_member_add(desk, ctx_end->layout);
 
-   EFFINF("Rotation End Created", NULL, NULL);
+   EFFINF("Rotation End Created", NULL);
 
    int diff = _rotation_zone->curr_angle - _rotation_zone->prev_angle;
    if (diff == 270) diff = - 90;
@@ -632,7 +632,7 @@ _rotation_effect_animator_begin_context_free(Rotation_Effect_Begin_Context *ctx_
 
    if (!ctx_begin) return;
 
-   EFFINF("Rotation Begin Free", NULL, NULL);
+   EFFINF("Rotation Begin Free", NULL);
 
    if (ctx_begin->layout)
      evas_object_hide(ctx_begin->layout);
@@ -656,7 +656,7 @@ _rotation_effect_animator_end_context_free(Rotation_Effect_End_Context *ctx_end)
 
    if (!ctx_end) return;
 
-   EFFINF("Rotation End Free", NULL, NULL);
+   EFFINF("Rotation End Free", NULL);
 
    if (ctx_end->layout)
      evas_object_hide(ctx_end->layout);
@@ -678,7 +678,7 @@ _rotation_effect_clear(Rotation_Effect *effect)
 {
    if (!effect) return;
 
-   EFFINF("Rotation Effect Clear", NULL, NULL);
+   EFFINF("Rotation Effect Clear", NULL);
 
    effect->targets = eina_list_free(effect->targets);
    effect->waiting_list = eina_list_free(effect->waiting_list);
@@ -784,7 +784,7 @@ _norender_timer_timeout(void *data)
    effect->norender_timer = NULL;
    effect->norender = EINA_FALSE;
 
-   EFFINF("EFF norender pop - timeout", NULL, NULL);
+   EFFINF("EFF norender pop - timeout", NULL);
 
    e_comp_canvas_norender_pop();
 
@@ -808,12 +808,12 @@ _rotation_effect_start(Rotation_Effect *effect)
         effect->norender_timer = NULL;
         effect->norender = EINA_FALSE;
 
-        EFFINF("EFF norender pop - start", NULL, NULL);
+        EFFINF("EFF norender pop - start", NULL);
 
         e_comp_canvas_norender_pop();
      }
 
-   EFFINF("Rotation Effect Start", NULL, NULL);
+   EFFINF("Rotation Effect Start", NULL);
 
    effect->running = EINA_TRUE;
 
@@ -848,7 +848,7 @@ _rotation_effect_animator_begin_prepare(Rotation_Effect *effect, E_Desk *desk)
         return;
      }
 
-   EFFINF("Rotation Begin Prepared", NULL, NULL);
+   EFFINF("Rotation Begin Prepared", NULL);
 
    /* add hwc override */
    e_comp_override_add();
@@ -859,7 +859,7 @@ _rotation_effect_animator_begin_prepare(Rotation_Effect *effect, E_Desk *desk)
     */
    if (!effect->norender)
      {
-        EFFINF("EFF norender push ", NULL, NULL);
+        EFFINF("EFF norender push ", NULL);
 
         e_comp_canvas_norender_push();
 
@@ -889,7 +889,7 @@ _rotation_effect_animator_end_prepare(Rotation_Effect *effect, E_Desk *desk)
    effect->ctx_end = _rotation_effect_end_create(effect, effect->targets, desk);
    if (!effect->ctx_end) return;
 
-   EFFINF("Rotation End Prepared", NULL, NULL);
+   EFFINF("Rotation End Prepared", NULL);
 
    effect->targets = eina_list_free(effect->targets);
 }
@@ -909,7 +909,7 @@ _rotation_effect_cb_zone_rotation_begin(void *data, int type, void *event)
    if (!zone) return ECORE_CALLBACK_PASS_ON;
 
    EFFINF("Zone rotation begin zone(prev:%d cur:%d)",
-          NULL, NULL,
+          NULL,
           zone->rot.prev, zone->rot.curr);
 
    if (zone->rot.prev == zone->rot.curr) return ECORE_CALLBACK_PASS_ON;
@@ -940,7 +940,7 @@ _rotation_effect_cb_zone_rotation_end(void *data, int type, void *event)
    zone = ev->zone;
    if (!zone) return ECORE_CALLBACK_PASS_ON;
 
-   EFFINF("Zone rotation end angle(prev:%d cur:%d)", NULL, NULL,
+   EFFINF("Zone rotation end angle(prev:%d cur:%d)", NULL,
           zone->rot.prev, zone->rot.curr);
 
    if (effect->running) return ECORE_CALLBACK_PASS_ON;
@@ -976,7 +976,7 @@ _rotation_effect_cb_zone_rotation_cancel(void *data, int type, void *event)
    effect = (Rotation_Effect *)data;
    if (!effect) return ECORE_CALLBACK_PASS_ON;
 
-   EFFINF("Zone Rotation Cancelled", NULL, NULL);
+   EFFINF("Zone Rotation Cancelled", NULL);
 
    if (effect->running) return ECORE_CALLBACK_PASS_ON;
    if (effect->targets) _rotation_effect_cancel_send(zone);
@@ -989,7 +989,7 @@ _rotation_effect_cb_zone_rotation_cancel(void *data, int type, void *event)
         effect->norender_timer = NULL;
         effect->norender = EINA_FALSE;
 
-        EFFINF("EFF norender pop - cancel", NULL, NULL);
+        EFFINF("EFF norender pop - cancel", NULL);
 
         e_comp_canvas_norender_pop();
      }
@@ -1104,7 +1104,7 @@ _rotation_effect_free(Rotation_Effect *effect)
    effect->norender_timer = NULL;
    if (effect->norender)
      {
-        EFFINF("EFF norender pop - free", NULL, NULL);
+        EFFINF("EFF norender pop - free", NULL);
 
         e_comp_canvas_norender_pop();
      }