yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=001a109ba71ae82697369cfb9e73a3be51fbc67e
commit 001a109ba71ae82697369cfb9e73a3be51fbc67e
Author: Yakov Goldberg <yako...@samsung.com>
Date: Tue Mar 24 15:04:35 2015 +0200
Fix warning messages
---
src/bin/egui_gui/dnd.c | 2 +-
src/bin/egui_gui/editor.c | 13 +++++++------
src/bin/egui_gui/prop_layout.c | 2 +-
src/bin/egui_gui/rmview.c | 8 +++-----
src/bin/main.c | 4 +---
src/lib/gui_parser.c | 2 +-
src/lib/gui_widget.c | 4 ++--
7 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/bin/egui_gui/dnd.c b/src/bin/egui_gui/dnd.c
index 9519c0a..efd6f8b 100644
--- a/src/bin/egui_gui/dnd.c
+++ b/src/bin/egui_gui/dnd.c
@@ -535,7 +535,7 @@ drag_stop()
static Target_Info*
_target_info_new(Gui_Widget *wdg, Eo *obj)
{
- Target_Info *ti;
+ Target_Info *ti = NULL;
if (wdg)
{
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index c501ba6..825cbe1 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -1186,7 +1186,8 @@ _edc_file_updated(void *data, Ecore_File_Monitor *em
EINA_UNUSED, Ecore_File_Eve
eina_strbuf_append_printf(strbuf, " -dd %s/data", path);
remove(resource_value_get(res));
- system(eina_strbuf_string_get(strbuf));
+ int sys_ret = system(eina_strbuf_string_get(strbuf));
+ (void) sys_ret;
eina_strbuf_free(strbuf);
/* we update the observers only if the invocation is from the
system and not from _widget_prop_add */
if (file_path) observers_invoke(resource_eid_get(res));
@@ -1409,7 +1410,7 @@ _drop_target_main_wdg_enter(void *data, Evas_Object *obj)
Eo *canvas_drop_target = obj;
Eo *canvas = NULL;
Gui_Widget *wdg = data;
- DnD_Info *di;
+ DnD_Info *di = NULL;
/* If wdg == NULL, then canvas is a drop target or we have a error.*/
if (wdg)
{
@@ -1455,7 +1456,7 @@ _drop_target_main_wdg_leave(void *data, Evas_Object *obj)
{
Gui_Widget *wdg = data;
Eo *canvas_drop_target = obj;
- DnD_Info *di;
+ DnD_Info *di = NULL;
if (wdg)
{
di = wdg_data_get(wdg, EDITOR_DND_DATA);
@@ -1592,7 +1593,7 @@ _drop_target_drop(void *data, Evas_Object *obj,
Elm_Selection_Data *ev)
{
Gui_Widget *wdg = data;
Eo *canvas_drop_target = obj;
- DnD_Info *di;
+ DnD_Info *di = NULL;
_wdg_border_draw(NULL, EINA_FALSE, BORDER_DROP_TARGET);
if (wdg)
{
@@ -1998,8 +1999,8 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x,
Evas_Coord y, Elm_Xdnd_Actio
{
Eo *canvas_drop_target = obj;
Gui_Widget *wdg = data;
- DnD_Info *di;
- Eo *wdg_eo;
+ DnD_Info *di = NULL;
+ Eo *wdg_eo = NULL;
Evas_Coord obj_x = 0, obj_y = 0;
/* If wdg == NULL, then canvas is a drop target or we have a error.*/
if (wdg)
diff --git a/src/bin/egui_gui/prop_layout.c b/src/bin/egui_gui/prop_layout.c
index 317f0e9..e0a6dd5 100644
--- a/src/bin/egui_gui/prop_layout.c
+++ b/src/bin/egui_gui/prop_layout.c
@@ -234,7 +234,7 @@ _proplayout_toolbar_clicked(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED
void
proplayout_view_switch(It_Data_Type type)
{
- Elm_Object_Item *it;
+ Elm_Object_Item *it = NULL;
Egui_Layout_Widgets *g = egui_layout_gui_get();
switch (type)
{
diff --git a/src/bin/egui_gui/rmview.c b/src/bin/egui_gui/rmview.c
index ae5b8ac..77663f2 100644
--- a/src/bin/egui_gui/rmview.c
+++ b/src/bin/egui_gui/rmview.c
@@ -363,7 +363,7 @@ _rmview_build(Rmview_Resource_Type type)
Gui_Context *ctx = _active_context_get();
Eo *label, *en, *bt;
const char *header1 = NULL, *header2 = NULL;
- Gui_Resource_Type type_start, type_end, type_itr;
+ Gui_Resource_Type type_start = RESOURCE_SENTINEL, type_end =
RESOURCE_SENTINEL, type_itr;
eo_do(g_rm_win->rm_table, elm_obj_table_clear(EINA_TRUE));
switch (type)
@@ -635,7 +635,7 @@ _rmview_toolbar_clicked(void *data, Evas_Object *obj
EINA_UNUSED, void *event_in
Eina_Bool
_rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
- Gui_Resource_Type res_type;
+ Gui_Resource_Type res_type = RESOURCE_SENTINEL;
const char *alias_str = NULL, *value_str = NULL;
const Gui_Context *ctx = _active_context_get();
eo_do(g_rm_win->rm_alias_entry, alias_str =
elm_obj_widget_part_text_get(NULL));
@@ -649,8 +649,6 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Eve
return EO_CALLBACK_CONTINUE;
}
- Gui_Resource *gui_res;
-
switch (_rmview_toolbar_selected_type)
{
case RMVIEW_IMAGE:
@@ -701,7 +699,7 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Eve
return EO_CALLBACK_CONTINUE;
}
- gui_res = gui_context_resource_new((Gui_Context *) ctx, res_type,
alias_str);
+ Gui_Resource *gui_res = gui_res = gui_context_resource_new((Gui_Context *)
ctx, res_type, alias_str);
if (!gui_res)
{
ERR("Cannot create resource of type: %d for alias %s", res_type,
alias_str);
diff --git a/src/bin/main.c b/src/bin/main.c
index 9e14ddb..f94afd3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -31,13 +31,11 @@ _generate(const char *in_file, const char *out_path,
Generator_Export_Format for
char *out_dir = NULL;
const char *out_file;
- char cur_dir[PATH_MAX];
out_dir = ecore_file_dir_get(out_path);
out_file = ecore_file_file_get(out_path);
if (!strcmp(".", out_dir))
{
- getcwd(cur_dir, PATH_MAX);
- path = cur_dir;
+ path = getcwd(NULL, PATH_MAX);
}
else
{
diff --git a/src/lib/gui_parser.c b/src/lib/gui_parser.c
index 51fc7e1..bf84391 100644
--- a/src/lib/gui_parser.c
+++ b/src/lib/gui_parser.c
@@ -272,7 +272,7 @@ _read_items_section(const Gui_Context *gui_ctx, Gui_Widget
*wdg, Item_Container_
Item_Container_Item *wit = item_container_item_new((Gui_Context
*)wdg_context_get(wdg), ntype, prop, it_name);
Gui_Value *val_parent_it = NULL, *val_label = NULL, *val_icon = NULL,
*val_cb = NULL;
- Gui_Type val_icon_type;
+ Gui_Type val_icon_type = GUI_TYPE_NONE;
Gui_Value *val_prev_btn = NULL, *val_next_btn = NULL, *val_content =
NULL;
Gui_Value *val_style = NULL;
diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index 153523f..ff99239 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -1814,7 +1814,7 @@ wdg_obj_container_content_reorder(const Gui_Widget *wdg,
int visual_idx, intptr_
* if dir is UP, we insert data after (idx - 1) (after we deleted)*/
if (dir == DOWN)
{
- Eina_List *next_lst;
+ Eina_List *next_lst = NULL;
/* Looking for next active item. */
EINA_LIST_FOREACH(eina_list_nth_list(c->container_items,
real_idx), itr, citr)
{
@@ -1830,7 +1830,7 @@ wdg_obj_container_content_reorder(const Gui_Widget *wdg,
int visual_idx, intptr_
}
else if (dir == UP)
{
- Eina_List *prev_lst;
+ Eina_List *prev_lst = NULL;
/* Looking for prev active item. */
EINA_LIST_FOREACH(c->container_items, itr, citr)
{
--
