diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
index ab7f96c76b..9006fc8c10 100644
--- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
+++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
@@ -132,7 +132,6 @@ ecore_desktop_ini_get(const char *file)
}
}
- buffer[0] = (char)0;
fclose(f);
return result;
diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c
index 172b812c61..d837fe0e4d 100644
--- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c
+++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c
@@ -448,7 +448,7 @@ ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang __UNUSED__
theme_path = strdup(icon_theme);
theme_dir = ecore_file_get_dir(theme_path);
if (theme_dir)
- icon_theme = (char *)ecore_file_get_file(theme_dir);
+ icon_theme = ecore_file_get_file(theme_dir);
#ifdef DEBUG
printf("LOADING THEME %s - %s\n", icon_theme, theme_path);
#endif
@@ -483,7 +483,7 @@ ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang __UNUSED__
/* According to the spec, name and comment are required, but we can fake those easily enough. */
value = ecore_hash_get(result->group, "Name");
- if (!value) value = (char *) icon_theme;
+ if (!value) value = icon_theme;
result->name = strdup(value);
value = ecore_hash_get(result->group, "Comment");
if (!value) value = "No comment provided.";
diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c
index 8fa7210a35..1c95b93b12 100644
--- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c
+++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c
@@ -936,6 +936,7 @@ _ecore_desktop_menu_unxml_rules(Ecore_Desktop_Tree * rules,
{
if (tree->elements[i].type == ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING)
{
+ /* FIXME or would be valid input (which this won't catch) */
if (strcmp((char *)tree->elements[i].element, "