resolve some prevent issues

Change-Id: Ib0b05be4712161f9eb60e9ce698aea04b9b492a7

diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index e84612b..316918d 100644 (file)
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -118,7 +118,6 @@ handle_run(int fd, unsigned long bytes)
    if (argc <= 0)
      {
         CRITICAL("no executable specified");
-        close(fd);
         return;
      }
    

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 3f7149c..d759c65 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -216,13 +216,8 @@ _access_info_cb(void *data, Evas_Object *obj __UNUSED__)
 
    if (!it) return NULL;
 
-   if ((!txt) && (!icon))
-     {
-        txt = it->label;
-        icon = it->icon;
-     }
-   else if (!txt) txt = it->label;
-   else if (!icon) icon = it->icon;
+   txt = it->label;
+   icon = it->icon;
 
    if (txt && icon)
      {

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 3c9fc3a..353e469 100644 (file)
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -925,9 +925,6 @@ _color_bars_add(Evas_Object *obj)
            case 3:
              sd->cb_data[i]->color_type = ALPHA;
              break;
-
-           default:
-             break;
           }
 
         /* load colorbar area */

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index cde2bd0..3d4ce79 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1405,7 +1405,7 @@ static Eina_Bool
 _elm_entry_smart_on_focus(Evas_Object *obj)
 {
    Evas_Object *top;
-   Eina_Bool top_is_win;
+   Eina_Bool top_is_win = EINA_FALSE;
 
    ELM_ENTRY_DATA_GET(obj, sd);
 

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index cf6700b..aa2f5be 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -6832,7 +6832,6 @@ elm_genlist_item_select_mode_set(Elm_Object_Item *item,
    Elm_Gen_Item *it = (Elm_Gen_Item *)item;
 
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(item);
-   if (!it) return;
    if (mode >= ELM_OBJECT_SELECT_MODE_MAX)
      return;
    if (it->select_mode != mode)
@@ -6871,8 +6870,6 @@ elm_genlist_item_select_mode_get(const Elm_Object_Item *item)
 
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(item, ELM_OBJECT_SELECT_MODE_MAX);
 
-   if (!it) return ELM_OBJECT_SELECT_MODE_MAX;
-
    return it->select_mode;
 }
 
@@ -6962,7 +6959,11 @@ _elm_genlist_proxy_item_new(const Elm_Object_Item *item)
 
    pi->proxy = evas_object_image_filled_add
       (evas_object_evas_get(ELM_WIDGET_DATA(GL_IT(it)->wsd)->obj));
-   if (!pi->proxy) return EINA_FALSE;
+   if (!pi->proxy)
+     {
+        free(pi);
+        return NULL;
+     }
    evas_object_clip_set(pi->proxy, evas_object_clip_get(GL_IT(it)->wsd->pan_obj));
    evas_object_smart_member_add(pi->proxy, GL_IT(it)->wsd->pan_obj);
    evas_object_hide(pi->proxy);
@@ -7344,7 +7345,8 @@ _item_fx_done(Elm_Transit_Effect *data, Elm_Transit *transit __UNUSED__)
    Elm_Gen_FX_Item *fx_done_it = data;
    Elm_Genlist_Smart_Data *sd = GL_IT(fx_done_it->it)->wsd;
 
-   if ((!fx_done_it) || (!fx_done_it->it) || (!sd)) return;
+   if (!fx_done_it) return;
+   if ((!fx_done_it->it) || (!sd)) return;
 
    evas_object_image_source_visible_set(fx_done_it->proxy, EINA_TRUE);
    evas_object_lower(fx_done_it->proxy);
@@ -7367,7 +7369,8 @@ _item_fx_del_cb(void *data, Elm_Transit *transit __UNUSED__)
    Eina_List *l;
    Elm_Genlist_Smart_Data *sd = GL_IT(fx_done_it->it)->wsd;
 
-   if ((!fx_done_it) || (!fx_done_it->it) || (!sd)) return;
+   if (!fx_done_it) return;
+   if ((!fx_done_it->it) || (!sd)) return;
 
    sd->fx_items = eina_list_remove(sd->fx_items, fx_done_it);
    GL_IT(fx_done_it->it)->fi = NULL;