svace fix

Change-Id: I8b13dbeab9825cff2b4e8fcbf1b3462d7c1fb2cd

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 4f6f20521b0bb29c29bd11dfa62598a431db1937..a7535fde1b8564dcc10566c0613421379081d736 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -750,7 +750,6 @@ _e_client_find_focus_same_layer(E_Client *ec)
 
    EINA_INLIST_REVERSE_FOREACH(e_comp->layers[id].clients, temp_ec)
      {
-        if (!temp_ec) continue;
         if (temp_ec == ec) continue;
         if (e_object_is_del(E_OBJECT(temp_ec))) continue;
         if (e_client_util_ignored_get(temp_ec)) continue;

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 0015011c1605b8d30916bb4d536f7ea98d7d93ab..40b453a838ea03fc912d13495877e88a97b7029e 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -584,7 +584,8 @@ _hwc_plane_change_ec(E_Plane *ep, E_Client *old_ec, E_Client *new_ec)
      {
         ELOGF("HWC", "failed to set new_ec(%s) on %d",
               NULL, new_ec,
-              e_client_util_name_get(new_ec) ? new_ec->icccm.name : "no name", ep->zpos);
+              new_ec ? (new_ec->icccm.name ? new_ec->icccm.name : "no name") : "NULL",
+              ep->zpos);
      }
 
    return ret;

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 0d5da4adf8d4fc30857878f6381deecbc2b4b53b..8f1fdbee59174819eb67266509c039af87b72ce2 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -4626,7 +4626,7 @@ e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb
 E_API unsigned int
 e_comp_object_is_animating(Evas_Object *obj)
 {
-   SOFT_ENTRY(0);
+   API_ENTRY 0;
 
    return cw->animating;
 }
@@ -4634,7 +4634,7 @@ e_comp_object_is_animating(Evas_Object *obj)
 E_API void
 e_comp_object_alpha_set(Evas_Object *obj, Eina_Bool alpha)
 {
-   SOFT_ENTRY();
+   API_ENTRY;
 
    if ((cw->external_content) &&
        (cw->content_type != E_COMP_OBJECT_CONTENT_TYPE_EXT_IMAGE))

diff --git a/src/bin/e_info_protocol.c b/src/bin/e_info_protocol.c
index 89eb781fd48d6d1ef8e1a7291fe1e48861f7ee4c..a9b7d303c452600fbf2b2fc60a1f78f638f3a94a 100644 (file)
--- a/src/bin/e_info_protocol.c
+++ b/src/bin/e_info_protocol.c
@@ -963,6 +963,11 @@ e_info_protocol_rule_set(const int argc, const char **argv, char *reply, int *le
                {
                   _e_info_rulechecker_destroy(rc);
                   rc = _e_info_rulechecker_init();
+                  if (!rc)
+                    {
+                       REPLY("Error : rules not removed\n");
+                       return EINA_FALSE;
+                    }
                   REPLY("Every rules were successfully removed.\n");
                }
              else

diff --git a/src/bin/e_slot.c b/src/bin/e_slot.c
index 927e4649513875338beb03f0f38484b6d8ff8561..40063884a0d3c454145541d56c0a7e62d22165c0 100644 (file)
--- a/src/bin/e_slot.c
+++ b/src/bin/e_slot.c
@@ -347,10 +347,13 @@ e_slot_raise(Evas_Object *obj)
         if (e_client_util_ignored_get(ec)) continue;
         if (ec->layout.s_id != sd->id) continue;
         ELOGF("SLOT", "|raise ec[list add] - id:%d [cnt:%d]pid:%d", ec->pixmap, ec, sd->id, cnt++, ec->netwm.pid);
-        if (!top_ec) top_ec = below_ec = ec;
+        if (!top_ec) top_ec = ec;
         l = eina_list_append(l, ec);
      }
 
+   if (!top_ec) return;
+
+   below_ec = top_ec;
    cnt = 0;
    EINA_LIST_FREE(l, ec2)
      {

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 5ffefb492202e184a023ddcd3f7cf1d8bf30586f..c03a9cb4d53b296c6d4c6f48896fe9b5938275c1 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -989,10 +989,6 @@ e_zone_edge_free(E_Zone_Edge edge)
           zone->flip.switching = E_ZONE_EDGE_NONE;
         switch (edge)
           {
-           case E_ZONE_EDGE_NONE:
-             /* noop */
-             break;
-
            case E_ZONE_EDGE_LEFT:
              E_FREE_FUNC(zone->edge.left, evas_object_del);
              break;
@@ -1028,6 +1024,9 @@ e_zone_edge_free(E_Zone_Edge edge)
              E_FREE_FUNC(zone->corner.bottom_left, evas_object_del);
              E_FREE_FUNC(zone->corner.left_bottom, evas_object_del);
              break;
+
+           default:
+             break;
           }
      }
 }