summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2018-12-18 13:01:34 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2018-12-18 13:08:01 +0100
commit8a617fda979d1522a880f3e57d2e1adfc9f20814 (patch)
tree558ede3a2848bf783e9e57c9429fcaf0dd62ee81
parent83a0e83e3f3803ecb79ff58cb72e26586b9b466c (diff)
silence most left over compiler warnings
Summary: silence -Wshadow -Wunused-variable -Wunused-parameter Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7473
-rw-r--r--src/bin/elementary/quicklaunch.c6
-rw-r--r--src/bin/elementary/test_glview.c2
-rw-r--r--src/bin/elementary/test_glview_manygears.c2
-rw-r--r--src/lib/ecore/efl_model_composite_selection.c1
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/elementary/elm_focus_legacy.c6
-rw-r--r--src/lib/elementary/elm_gengrid.c8
-rw-r--r--src/lib/elementary/elm_genlist.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c1
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
11 files changed, 18 insertions, 20 deletions
diff --git a/src/bin/elementary/quicklaunch.c b/src/bin/elementary/quicklaunch.c
index 96bbcda..3e7598e 100644
--- a/src/bin/elementary/quicklaunch.c
+++ b/src/bin/elementary/quicklaunch.c
@@ -347,10 +347,10 @@ main(int argc, char **argv)
347 { 347 {
348 int fd; 348 int fd;
349 struct sockaddr_un client; 349 struct sockaddr_un client;
350 socklen_t len; 350 socklen_t slen;
351 351
352 len = sizeof(struct sockaddr_un); 352 slen = sizeof(struct sockaddr_un);
353 fd = accept(sock, (struct sockaddr *)&client, &len); 353 fd = accept(sock, (struct sockaddr *)&client, &slen);
354 354
355 DBG("Accepting connection."); 355 DBG("Accepting connection.");
356 elm_quicklaunch_sub_init(argc, argv); 356 elm_quicklaunch_sub_init(argc, argv);
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 6a133e9..8df1fdd 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -249,7 +249,7 @@ draw_gear(GLData *gld, Gear *gear, GLfloat *m,
249 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 249 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
250 6 * sizeof(GLfloat), NULL); 250 6 * sizeof(GLfloat), NULL);
251 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 251 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
252 6 * sizeof(GLfloat), (GLfloat *) 0 + 3); 252 6 * sizeof(GLfloat), (GLfloat *)(0 + 3 * sizeof(GLfloat *)));
253 gl->glEnableVertexAttribArray(0); 253 gl->glEnableVertexAttribArray(0);
254 gl->glEnableVertexAttribArray(1); 254 gl->glEnableVertexAttribArray(1);
255 gl->glDrawArrays(GL_TRIANGLE_STRIP, 0, gear->count); 255 gl->glDrawArrays(GL_TRIANGLE_STRIP, 0, gear->count);
diff --git a/src/bin/elementary/test_glview_manygears.c b/src/bin/elementary/test_glview_manygears.c
index 17e0558..6161341 100644
--- a/src/bin/elementary/test_glview_manygears.c
+++ b/src/bin/elementary/test_glview_manygears.c
@@ -461,7 +461,7 @@ draw_gear(GLData *gld, Gear *gear, GLfloat *transform,
461 461
462 // Set up the position of the attributes in the vertex buffer object 462 // Set up the position of the attributes in the vertex buffer object
463 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), NULL); 463 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), NULL);
464 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), (GLfloat *) 0 + 3); 464 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), (GLfloat *)(0 + 3 * sizeof(GLfloat *)));
465 465
466 // Enable the attributes 466 // Enable the attributes
467 gl->glEnableVertexAttribArray(0); 467 gl->glEnableVertexAttribArray(0);
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c
index ad14b74..18db24c 100644
--- a/src/lib/ecore/efl_model_composite_selection.c
+++ b/src/lib/ecore/efl_model_composite_selection.c
@@ -380,7 +380,6 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
380 Eo *parent; 380 Eo *parent;
381 Eina_Value *vs; 381 Eina_Value *vs;
382 unsigned long selected = 0; 382 unsigned long selected = 0;
383 Eina_Bool success;
384 383
385 // In this case we need to first unselect the previously selected one 384 // In this case we need to first unselect the previously selected one
386 // and then commit the change to this one. 385 // and then commit the change to this one.
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 5877ebb..a050edc 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3836,7 +3836,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3836 Edje_Real_Part *confine_to = NULL; 3836 Edje_Real_Part *confine_to = NULL;
3837 Edje_Real_Part *threshold = NULL; 3837 Edje_Real_Part *threshold = NULL;
3838 FLOAT_T pos = ZERO, pos2; 3838 FLOAT_T pos = ZERO, pos2;
3839 Edje_Calc_Params lp3 = { 0 }; 3839 Edje_Calc_Params lp3 = { { 0 } };
3840 Evas_Coord mmw = 0, mmh = 0; 3840 Evas_Coord mmw = 0, mmh = 0;
3841 Eina_Bool map_colors_free = EINA_FALSE; 3841 Eina_Bool map_colors_free = EINA_FALSE;
3842 3842
diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index fdf6b4e..31e1c32 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -174,7 +174,7 @@ elm_object_focus_cycle(Evas_Object *obj,
174} 174}
175 175
176static Evas_Object* 176static Evas_Object*
177_get_legacy_target(Evas_Object *eo, Elm_Widget_Smart_Data *pd, Elm_Focus_Direction dir) 177_get_legacy_target(EINA_UNUSED Evas_Object *eo, Elm_Widget_Smart_Data *pd, Elm_Focus_Direction dir)
178{ 178{
179 Evas_Object *result = NULL; 179 Evas_Object *result = NULL;
180 180
@@ -245,8 +245,8 @@ elm_object_focus_next(Evas_Object *obj,
245 { 245 {
246 Evas_Object *parent = eina_array_data_get(old_chain, i); 246 Evas_Object *parent = eina_array_data_get(old_chain, i);
247 if (!elm_widget_is(parent)) continue; 247 if (!elm_widget_is(parent)) continue;
248 ELM_WIDGET_DATA_GET_OR_RETURN(parent, pd); 248 ELM_WIDGET_DATA_GET_OR_RETURN(parent, ppd);
249 legacy_target = _get_legacy_target(parent, pd, dir); 249 legacy_target = _get_legacy_target(parent, ppd, dir);
250 if (legacy_target) break; 250 if (legacy_target) break;
251 } 251 }
252 eina_array_free(new_chain); 252 eina_array_free(new_chain);
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index ba71021..f321edf 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4248,8 +4248,8 @@ _elm_gengrid_efl_ui_focus_manager_setup_on_first_touch(Eo *obj, Elm_Gengrid_Data
4248 elm_gengrid_item_selected_set(eo_it, EINA_TRUE); 4248 elm_gengrid_item_selected_set(eo_it, EINA_TRUE);
4249 else 4249 else
4250 { 4250 {
4251 ELM_GENGRID_ITEM_DATA_GET(eo_it, pd); 4251 ELM_GENGRID_ITEM_DATA_GET(eo_it, pd_it);
4252 if (pd->realized) 4252 if (pd_it->realized)
4253 efl_ui_focus_manager_focus_set(obj, eo_it); 4253 efl_ui_focus_manager_focus_set(obj, eo_it);
4254 } 4254 }
4255 } 4255 }
@@ -4261,7 +4261,7 @@ _elm_gengrid_efl_ui_focus_manager_setup_on_first_touch(Eo *obj, Elm_Gengrid_Data
4261} 4261}
4262 4262
4263static Efl_Ui_Focus_Object* 4263static Efl_Ui_Focus_Object*
4264_select_candidate(Eo *obj, Elm_Gengrid_Data *pd, Efl_Ui_Focus_Direction direction) 4264_select_candidate(Eo *obj, EINA_UNUSED Elm_Gengrid_Data *pd, Efl_Ui_Focus_Direction direction)
4265{ 4265{
4266 Elm_Object_Item *first = elm_gengrid_first_item_get(obj); 4266 Elm_Object_Item *first = elm_gengrid_first_item_get(obj);
4267 Elm_Object_Item *last = elm_gengrid_last_item_get(obj); 4267 Elm_Object_Item *last = elm_gengrid_last_item_get(obj);
@@ -4304,7 +4304,7 @@ _elm_gengrid_efl_ui_focus_manager_move(Eo *obj, Elm_Gengrid_Data *pd, Efl_Ui_Foc
4304} 4304}
4305 4305
4306EOLIAN static Efl_Ui_Focus_Object* 4306EOLIAN static Efl_Ui_Focus_Object*
4307_elm_gengrid_efl_ui_focus_manager_manager_focus_get(const Eo *obj, Elm_Gengrid_Data *pd) 4307_elm_gengrid_efl_ui_focus_manager_manager_focus_get(const Eo *obj, EINA_UNUSED Elm_Gengrid_Data *pd)
4308{ 4308{
4309 Eo *focused_obj = efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS)); 4309 Eo *focused_obj = efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS));
4310 Eo *registered_manager = efl_ui_focus_object_focus_manager_get(obj); 4310 Eo *registered_manager = efl_ui_focus_object_focus_manager_get(obj);
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 0ad79d1..0e7b3a4 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3444,7 +3444,7 @@ _elm_genlist_efl_ui_focus_manager_setup_on_first_touch(Eo *obj, Elm_Genlist_Data
3444} 3444}
3445 3445
3446EOLIAN static Efl_Ui_Focus_Object* 3446EOLIAN static Efl_Ui_Focus_Object*
3447_elm_genlist_efl_ui_focus_manager_manager_focus_get(const Eo *obj, Elm_Genlist_Data *pd) 3447_elm_genlist_efl_ui_focus_manager_manager_focus_get(const Eo *obj, EINA_UNUSED Elm_Genlist_Data *pd)
3448{ 3448{
3449 Eo *focused_obj = efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS)); 3449 Eo *focused_obj = efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS));
3450 Eo *registered_manager = efl_ui_focus_object_focus_manager_get(obj); 3450 Eo *registered_manager = efl_ui_focus_object_focus_manager_get(obj);
@@ -3456,7 +3456,7 @@ _elm_genlist_efl_ui_focus_manager_manager_focus_get(const Eo *obj, Elm_Genlist_D
3456} 3456}
3457 3457
3458static Efl_Ui_Focus_Object* 3458static Efl_Ui_Focus_Object*
3459_select_candidate(Eo *obj, Elm_Genlist_Data *pd, Efl_Ui_Focus_Direction direction) 3459_select_candidate(Eo *obj, EINA_UNUSED Elm_Genlist_Data *pd, Efl_Ui_Focus_Direction direction)
3460{ 3460{
3461 Elm_Object_Item *first = elm_genlist_first_item_get(obj); 3461 Elm_Object_Item *first = elm_genlist_first_item_get(obj);
3462 Elm_Object_Item *last = elm_genlist_last_item_get(obj); 3462 Elm_Object_Item *last = elm_genlist_last_item_get(obj);
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 3bfac1e..0e66623 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -2675,7 +2675,7 @@ _elm_scroll_momentum_calc(int dx, int dy, double dt, double *vx, double *vy, int
2675 fvel_y = vel_y * (1/60.0); 2675 fvel_y = vel_y * (1/60.0);
2676 fvel = vel * (1/60.0); 2676 fvel = vel * (1/60.0);
2677 2677
2678 if (abs(fvel) < _elm_config->thumbscroll_threshold ) return EINA_FALSE; 2678 if (abs((int) fvel) < _elm_config->thumbscroll_threshold ) return EINA_FALSE;
2679 2679
2680 // calculate a number of frames to reach min_px when it follows a geometric sequence with scale factor r 2680 // calculate a number of frames to reach min_px when it follows a geometric sequence with scale factor r
2681 n = log(min_px/fvel) / log(r); 2681 n = log(min_px/fvel) / log(r);
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index ac45c6d..b2352aa 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -259,7 +259,6 @@ EOLIAN static Eina_Bool
259_efl_canvas_vg_object_efl_file_file_set(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd, const char *file, const char *key) 259_efl_canvas_vg_object_efl_file_file_set(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd, const char *file, const char *key)
260{ 260{
261 Vg_Cache_Entry *old_entry; 261 Vg_Cache_Entry *old_entry;
262 int w, h;
263 262
264 if (!file) return EINA_FALSE; 263 if (!file) return EINA_FALSE;
265 264
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 71fb0e5..644aa79 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -5564,7 +5564,7 @@ _layout_item_obstacle_get(Ctxt *c, Evas_Object_Textblock_Item *it);
5564static int 5564static int
5565_layout_par(Ctxt *c) 5565_layout_par(Ctxt *c)
5566{ 5566{
5567 Evas_Object_Textblock_Item *it, *prev_it; 5567 Evas_Object_Textblock_Item *it;
5568 Eina_List *i; 5568 Eina_List *i;
5569 int ret = 0; 5569 int ret = 0;
5570 int wrap = -1; 5570 int wrap = -1;
@@ -5681,8 +5681,8 @@ _layout_par(Ctxt *c)
5681 int redo_item = 0; 5681 int redo_item = 0;
5682 Evas_Textblock_Obstacle_Info *obs_info = NULL; 5682 Evas_Textblock_Obstacle_Info *obs_info = NULL;
5683 Evas_Coord itw; 5683 Evas_Coord itw;
5684 Evas_Object_Textblock_Item *prev_it = it;
5684 5685
5685 prev_it = it;
5686 it = _ITEM(eina_list_data_get(i)); 5686 it = _ITEM(eina_list_data_get(i));
5687 /* Skip visually deleted items */ 5687 /* Skip visually deleted items */
5688 if (it->visually_deleted || 5688 if (it->visually_deleted ||