xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6f6407729e8cb6da3813ac6ee1b4be8045bb5f89
commit 6f6407729e8cb6da3813ac6ee1b4be8045bb5f89
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Sep 26 17:03:32 2019 +0200
efl_ui/layout: fix shadow warning
Summary:
a variable with the same name is declared above
Depends on D10192
Reviewers: segfaultxavi
Reviewed By: segfaultxavi
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10193
---
src/lib/elementary/efl_ui_layout.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_layout.c
b/src/lib/elementary/efl_ui_layout.c
index 6d58277e72..d25e86ccb2 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -570,8 +570,8 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(0, 0));
else
{
- const char *version = edje_object_data_get(wd->resize_obj, "version");
- if (!version)
+ const char *theme_version = edje_object_data_get(wd->resize_obj,
"version");
+ if (!theme_version)
{
ERR("Widget(%p) with type '%s' is not providing a version in its
theme!", obj,
efl_class_name_get(efl_class_get(obj)));
@@ -580,7 +580,7 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
else
{
errno = 0;
- sd->version = strtoul(version, NULL, 10);
+ sd->version = strtoul(theme_version, NULL, 10);
if (errno)
{
ERR("Widget(%p) with type '%s' is not providing a valid
version in its theme!", obj,
--
