get rid of unused e_pixmap parameter of ELOG

Change-Id: I662a022cb6fa871507c567791a088df94c4804a8

diff --git a/packaging/e-mod-tizen-wm-policy.spec b/packaging/e-mod-tizen-wm-policy.spec
index e8a5266..a85d10c 100644 (file)
--- a/packaging/e-mod-tizen-wm-policy.spec
+++ b/packaging/e-mod-tizen-wm-policy.spec
@@ -35,7 +35,7 @@ The Enlightenment WM Policy Module for Tizen
 %setup -q -n %{name}-%{version}
 
 %build
-export CFLAGS+=" -DE_LOGGING=1 -Werror-implicit-function-declaration"
+export CFLAGS+=" -DE_LOGGING=2 -Werror-implicit-function-declaration"
 %if %{with wayland}
 %reconfigure \
       --enable-wayland-only \

diff --git a/src/rotation/e_mod_rotation_wl.c b/src/rotation/e_mod_rotation_wl.c
index 7c0f96e..fda90fe 100644 (file)
--- a/src/rotation/e_mod_rotation_wl.c
+++ b/src/rotation/e_mod_rotation_wl.c
@@ -193,7 +193,7 @@ _camera_check(E_Client *ec)
 static void
 _unlock_rot_for_fg_app(E_Zone *zone)
 {
-   ELOGF("ROTATION", "UNLOCK for app-hint", NULL, NULL);
+   ELOGF("ROTATION", "UNLOCK for app-hint", NULL);
 
    e_zone_rotation_unblock_type_set(zone,
                                     E_ZONE_ROT_UNBLOCK_TYPE_APP_HINT,
@@ -206,7 +206,7 @@ _unlock_rot_for_fg_app(E_Zone *zone)
 static void
 _try_lock_rot_for_fg_app(E_Zone *zone)
 {
-   ELOGF("ROTATION", "LOCK for app-hint", NULL, NULL);
+   ELOGF("ROTATION", "LOCK for app-hint", NULL);
 
    if (zone->rot.block.sys_auto_rot)
      e_zone_rotation_set(zone, 0);
@@ -478,12 +478,12 @@ _e_tizen_rotation_set_preferred_angle_cb(struct wl_client *client,
    if (!ec)
      return;
 
-   ELOGF("ROTATION", "Request to set Preferred angle:%d", ec->pixmap, ec, TIZEN_ROTATION_ANGLE_TO_INT(angle));
+   ELOGF("ROTATION", "Request to set Preferred angle:%d", ec, TIZEN_ROTATION_ANGLE_TO_INT(angle));
    if ((angle != TIZEN_ROTATION_ANGLE_NONE) &&
        (!e_mod_pol_conf_rot_enable_get(TIZEN_ROTATION_ANGLE_TO_INT(angle))))
      {
         ELOGF("ROTATION", "Preferred angle(%d) is not allowed. CONF disabled",
-              ec->pixmap, ec, TIZEN_ROTATION_ANGLE_TO_INT(angle));
+              ec, TIZEN_ROTATION_ANGLE_TO_INT(angle));
         return;
      }
 
@@ -1031,7 +1031,7 @@ _e_client_rotation_zone_set(E_Zone *zone, E_Client *include_ec, E_Client *exclud
         else
           {
              ELOGF("ROTATION", "   fg_ec:%x, bg_ec:%p CHECK %s(%p) parent:%p vis:%d argb:%d opaque:%d",
-                   ec->pixmap, ec, e_client_util_win_get(fg_ec), bg_ec, ec->icccm.name, ec, ec->parent,
+                   ec, e_client_util_win_get(fg_ec), bg_ec, ec->icccm.name, ec, ec->parent,
                    ec->visibility.obscured, ec->argb, ec->visibility.opaque);
              /* if already found background client,
               * that means this client is placed under background client */
@@ -1066,7 +1066,7 @@ _e_client_rotation_zone_set(E_Zone *zone, E_Client *include_ec, E_Client *exclud
                            (ec->visibility.obscured != E_VISIBILITY_FULLY_OBSCURED))
                          {
                             ELOGF("ROTATION", "Do rotation of below ec under bg_ec %s(%p)",
-                                  NULL, NULL, ec->icccm.name, ec);
+                                  NULL, ec->icccm.name, ec);
 
                             e_client_rotation_set(ec, cur_angle);
                          }
@@ -1267,7 +1267,7 @@ end:
 
    TRACE_DS_END();
 
-   ELOGF("ROTATION", "zone active angle %d", NULL, NULL, zone->rot.act);
+   ELOGF("ROTATION", "zone active angle %d", NULL, zone->rot.act);
    DBG("End to set zone rotation: %s >>>", ret ? "Change" : "Stay");
    return ret;
 }
@@ -1311,7 +1311,7 @@ _e_client_rotation_change_done(void)
    if (rot.screen_lock)
      {
         // do call comp_wl's screen unlock
-        ELOGF("ROTATION", "RENDERING resume", NULL, NULL);
+        ELOGF("ROTATION", "RENDERING resume", NULL);
         e_comp_canvas_norender_pop();
         rot.screen_lock = EINA_FALSE;
      }
@@ -1709,7 +1709,7 @@ e_client_rotation_set(E_Client *ec, int rotation)
         if (child->comp_data && !child->comp_data->mapped) continue;
 
         ELOGF("ROTATION", "Do rotation of child win %s(%p)",
-              NULL, NULL, child->icccm.name, child);
+              NULL, child->icccm.name, child);
 
         e_client_rotation_set(child, rotation);
      }
@@ -1787,14 +1787,14 @@ _e_zone_rotation_set_internal(E_Zone *zone, int rot)
    if (!e_config->wm_win_rotation) return;
 
    ELOGF("ROTATION", "ZONE_ROT |zone:%d|rot curr:%d, active:%d, rot:%d",
-          NULL, NULL, zone->num, zone->rot.curr, zone->rot.act, rot);
+         NULL, zone->num, zone->rot.curr, zone->rot.act, rot);
 
    if ((zone->rot.curr == rot) &&
        (zone->rot.act == rot))
      return;
 
    ELOGF("ROTATION", "ZONE_ROT |wait_for_done:%d->1",
-         NULL, NULL, zone->rot.wait_for_done);
+         NULL, zone->rot.wait_for_done);
 
    zone->rot.prev = zone->rot.act;
    zone->rot.curr = rot;
@@ -1823,7 +1823,7 @@ e_zone_rotation_set(E_Zone *zone, int rotation)
    if (rotation == -1)
      {
         ELOGF("ROTATION", "ZONE_ROT |UNKNOWN SET|zone:%d|rot curr:%d, rot:%d",
-              NULL, NULL, zone->num, zone->rot.curr, rotation);
+              NULL, zone->num, zone->rot.curr, rotation);
         return;
      }
 
@@ -1836,7 +1836,7 @@ e_zone_rotation_set(E_Zone *zone, int rotation)
                  (!e_mod_pol_conf_rot_enable_get(rotation)))
                {
                   ELOGF("ROTATION", "ZONE_ROT |SKIP|zone:%d curr:%d rotation:%d config is not allowed",
-                        NULL, NULL, zone->num, zone->rot.curr, rotation);
+                        NULL, zone->num, zone->rot.curr, rotation);
                   zone->rot.unknown_state = EINA_FALSE;
                   return;
                }
@@ -1851,13 +1851,13 @@ e_zone_rotation_set(E_Zone *zone, int rotation)
         if (zone->rot.block.sys_auto_rot)
           {
              ELOGF("ROTATION", "ZONE_ROT |SKIP|zone:%d curr:%d rotation:%d. auto rotation is locked",
-                    NULL, NULL, zone->num, zone->rot.curr, rotation);
+                   NULL, zone->num, zone->rot.curr, rotation);
              zone->rot.unknown_state = EINA_FALSE;
              return;
           }
 
         ELOGF("ROTATION", "ZONE_ROT |UNKNOWN SET|zone:%d|rot curr:%d, rot:%d",
-              NULL, NULL, zone->num, zone->rot.curr, rotation);
+              NULL, zone->num, zone->rot.curr, rotation);
         return;
      }
 
@@ -1874,7 +1874,7 @@ e_zone_rotation_sub_set(E_Zone *zone, int rotation)
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
 
    ELOGF("ROTATION", "SUB_SET  |zone:%d|rot curr:%d, rot:%d",
-         NULL, NULL, zone->num, zone->rot.curr, rotation);
+         NULL, zone->num, zone->rot.curr, rotation);
 
    zone->rot.sub = rotation;
 
@@ -1892,28 +1892,28 @@ e_zone_rotation_block_get(E_Zone *zone, int rot)
    /* 1. specific app which set special hint such as camera */
    if (zone->rot.unblock.app_hint)
      {
-        ELOGF("ROTATION", "BLOCK Get. unblocked by app_hint", NULL, NULL);
+        ELOGF("ROTATION", "BLOCK Get. unblocked by app_hint", NULL);
         return EINA_FALSE;
      }
 
    /* 2. not supported angle in wm-policy configuration */
    if (!e_mod_pol_conf_rot_enable_get(rot))
      {
-        ELOGF("ROTATION", "BLOCK Get. CONF disabled", NULL, NULL);
+        ELOGF("ROTATION", "BLOCK Get. CONF disabled", NULL);
         return EINA_TRUE;
      }
 
    /* 3. auto-rotation through vconf */
    if (zone->rot.block.sys_auto_rot)
      {
-        ELOGF("ROTATION", "BLOCK Get. AUTO_ROT disabled", NULL, NULL);
+        ELOGF("ROTATION", "BLOCK Get. AUTO_ROT disabled", NULL);
         return EINA_TRUE;
      }
 
    /* 4. temporary block count for the E sub-modules */
    if (zone->rot.block.mod_count > 0)
      {
-        ELOGF("ROTATION", "BLOCK Get. E internal block. %d", NULL, NULL,
+        ELOGF("ROTATION", "BLOCK Get. E internal block. %d", NULL,
               zone->rot.block.mod_count);
         return EINA_TRUE;
      }
@@ -1931,14 +1931,14 @@ e_zone_rotation_block_type_set(E_Zone *zone, E_Zone_Rot_Block_Type type, const c
      {
       case E_ZONE_ROT_BLOCK_TYPE_SYSTEM_AUTO_ROTATION:
          zone->rot.block.sys_auto_rot = block;
-         ELOGF("ROTATION", "BLOCK_SET. sys_auto_rot:%s", NULL, NULL,
+         ELOGF("ROTATION", "BLOCK_SET. sys_auto_rot:%s", NULL,
                block ? "true" : "false");
          break;
       case E_ZONE_ROT_BLOCK_TYPE_E_MODULE:
          if (block) zone->rot.block.mod_count++;
          else       zone->rot.block.mod_count--;
          if (zone->rot.block.mod_count <= 0) zone->rot.block.mod_count = 0;
-         ELOGF("ROTATION", "BLOCK_SET. e modules:%s count:%d", NULL, NULL,
+         ELOGF("ROTATION", "BLOCK_SET. e modules:%s count:%d", NULL,
                block ? "true" : "false", zone->rot.block.mod_count);
          break;
       default:
@@ -1958,7 +1958,7 @@ e_zone_rotation_unblock_type_set(E_Zone *zone, E_Zone_Rot_Unblock_Type type, con
      {
       case E_ZONE_ROT_UNBLOCK_TYPE_APP_HINT:
          zone->rot.unblock.app_hint = unblock;
-         ELOGF("ROTATION", "UnBLOCK_SET app hint:%s", NULL, NULL,
+         ELOGF("ROTATION", "UnBLOCK_SET app hint:%s", NULL,
                unblock ? "true" : "false");
          break;
       default:
@@ -1983,7 +1983,7 @@ e_zone_rotation_block_set(E_Zone *zone, const char *name_hint, Eina_Bool block)
    if (block) return EINA_TRUE;
 
    ELOGF("ROTATION", "ROT_BLOCK|RESUME|zone:%d|count:%d|from:%s|rot.pending:%d|next:%d",
-         NULL, NULL,
+         NULL,
          zone->num,
          zone->rot.block.mod_count,
          name_hint,
@@ -1998,13 +1998,13 @@ e_zone_rotation_block_set(E_Zone *zone, const char *name_hint, Eina_Bool block)
              if (e_zone_rotation_block_get(zone, zone->rot.next))
                {
                   zone->rot.pending = EINA_TRUE;
-                  ELOGF("ROTATION", "ROT_BLOCK|PAUSE|zone:%d|count:%d|from:%s", NULL, NULL,
+                  ELOGF("ROTATION", "ROT_BLOCK|PAUSE|zone:%d|count:%d|from:%s", NULL,
                         zone->num, zone->rot.block.mod_count, name_hint);
                   return EINA_TRUE;
                }
 
              ELOGF("ROTATION", "ZONE_ROT |wait_for_done:%d->1",
-                   NULL, NULL, zone->rot.wait_for_done);
+                   NULL, zone->rot.wait_for_done);
 
              zone->rot.prev = zone->rot.curr;
              zone->rot.curr = zone->rot.next;
@@ -2020,7 +2020,7 @@ e_zone_rotation_block_set(E_Zone *zone, const char *name_hint, Eina_Bool block)
                                   ev, _e_zone_event_rotation_change_begin_free, NULL);
 
                   ELOGF("ROTATION", "ROT_SET(P|zone:%d|rot:%d",
-                        NULL, NULL, zone->num, zone->rot.curr);
+                        NULL, zone->num, zone->rot.curr);
                }
           }
      }
@@ -2037,7 +2037,7 @@ e_zone_rotation_update_done(E_Zone *zone)
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
 
    ELOGF("ROTATION", "ROT_DONE |zone:%d|rot:%d",
-         NULL, NULL, zone->num, zone->rot.curr);
+         NULL, zone->num, zone->rot.curr);
 
    ev = E_NEW(E_Event_Zone_Rotation_Change_End, 1);
    if (ev)
@@ -2049,7 +2049,7 @@ e_zone_rotation_update_done(E_Zone *zone)
      }
 
    ELOGF("ROTATION", "ZONE_ROT |wait_for_done:%d->0",
-         NULL, NULL, zone->rot.wait_for_done);
+         NULL, zone->rot.wait_for_done);
 
    zone->rot.wait_for_done = EINA_FALSE;
    if ((zone->rot.block.mod_count == 0) && (zone->rot.pending))
@@ -2058,7 +2058,7 @@ e_zone_rotation_update_done(E_Zone *zone)
         if (zone->rot.curr != zone->rot.next)
           {
              ELOGF("ROTATION", "ZONE_ROT |wait_for_done:%d->1",
-                   NULL, NULL, zone->rot.wait_for_done);
+                   NULL, zone->rot.wait_for_done);
 
              zone->rot.prev = zone->rot.curr;
              zone->rot.curr = zone->rot.next;
@@ -2075,7 +2075,7 @@ e_zone_rotation_update_done(E_Zone *zone)
                                   ev2, _e_zone_event_rotation_change_begin_free, NULL);
 
                   ELOGF("ROTATION", "ROT_SET(P|zone:%d|rot:%d",
-                        NULL, NULL, zone->num, zone->rot.curr);
+                        NULL, zone->num, zone->rot.curr);
 
                }
           }
@@ -2091,7 +2091,7 @@ e_zone_rotation_update_cancel(E_Zone *zone)
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
 
    ELOGF("ROTATION", "ZONE_ROT |wait_for_done:%d->0",
-         NULL, NULL, zone->rot.wait_for_done);
+         NULL, zone->rot.wait_for_done);
 
    zone->rot.wait_for_done = EINA_FALSE;
    if (zone->rot.pending)
@@ -2701,7 +2701,7 @@ _rot_cb_idle_enterer(void *data EINA_UNUSED)
                {
                   if (!rot.screen_lock)
                     {
-                       ELOGF("ROTATION", "RENDERING pause", NULL, NULL);
+                       ELOGF("ROTATION", "RENDERING pause", NULL);
 
                        e_pixmap_image_clear(ec->pixmap, 1);
                        e_comp_canvas_norender_push();
@@ -2712,7 +2712,7 @@ _rot_cb_idle_enterer(void *data EINA_UNUSED)
                {
                   if (rot.screen_lock)
                     {
-                       ELOGF("ROTATION", "RENDERING resume", NULL, NULL);
+                       ELOGF("ROTATION", "RENDERING resume", NULL);
                        e_comp_canvas_norender_pop();
                        rot.screen_lock = EINA_FALSE;
                     }
@@ -2735,7 +2735,7 @@ _rot_cb_idle_enterer(void *data EINA_UNUSED)
                }
              if ((!rot.screen_lock) && (!rot_block))
                {
-                  ELOGF("ROTATION", "RENDERING pause", NULL, NULL);
+                  ELOGF("ROTATION", "RENDERING pause", NULL);
 
                   EINA_LIST_FOREACH(rot.list, l, ec)
                      e_pixmap_image_clear(ec->pixmap, 1);

diff --git a/src/rotation/e_mod_sensord.c b/src/rotation/e_mod_sensord.c
index 19df204..fbe0524 100644 (file)
--- a/src/rotation/e_mod_sensord.c
+++ b/src/rotation/e_mod_sensord.c
@@ -55,7 +55,7 @@ _sensor_rotation_changed_cb(sensor_t       sensor,
     if (!zone) return;
     if (event_type != AUTO_ROTATION_EVENT_CHANGE_STATE) return;
 
-    ELOGF("ROTATION", "degree:%d", NULL, NULL, _ang_get((int)data->values[0]));
+    ELOGF("ROTATION", "degree:%d", NULL, _ang_get((int)data->values[0]));
 
     event = (int)data->values[0];