summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2019-08-08 17:18:45 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-08-08 17:18:46 -0400
commitcdb920ab084451c8395dea605d96d2bad277ce61 (patch)
tree5bc69959657f6dd611d2053dacde138c81d23091 /src/lib
parent9b7d71df79622246dc325ee70e0a7d23338eb9b8 (diff)
get rid of shadow variables
Summary: gl: add some EINA_FALLTHROUGH Reviewers: #reviewers, zmike Reviewed By: zmike Subscribers: zmike, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9525
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/efl_core_proc_env.c10
-rw-r--r--src/lib/ecore/efl_thread.c12
-rw-r--r--src/lib/elementary/efl_ui_format.c6
-rw-r--r--src/lib/eo/eo.c8
4 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/ecore/efl_core_proc_env.c b/src/lib/ecore/efl_core_proc_env.c
index 76f3bd1..a4ee9d7 100644
--- a/src/lib/ecore/efl_core_proc_env.c
+++ b/src/lib/ecore/efl_core_proc_env.c
@@ -32,7 +32,7 @@ _sync(Efl_Core_Env *obj, Efl_Core_Proc_Env_Data *pd)
32 Eina_List *existing_keys = NULL, *n; 32 Eina_List *existing_keys = NULL, *n;
33 Eina_Iterator *content; 33 Eina_Iterator *content;
34 const char *key; 34 const char *key;
35 char **env = NULL; 35 char **loc_env = NULL;
36 36
37 pd->in_sync = EINA_TRUE; 37 pd->in_sync = EINA_TRUE;
38 content = efl_core_env_content_get(obj); 38 content = efl_core_env_content_get(obj);
@@ -44,16 +44,16 @@ _sync(Efl_Core_Env *obj, Efl_Core_Proc_Env_Data *pd)
44 44
45#if defined (__FreeBSD__) || defined (__OpenBSD__) 45#if defined (__FreeBSD__) || defined (__OpenBSD__)
46 _dl_environ = dlsym(NULL, "environ"); 46 _dl_environ = dlsym(NULL, "environ");
47 if (_dl_environ) env = *_dl_environ; 47 if (_dl_environ) loc_env = *_dl_environ;
48 else ERR("Can't find envrion symbol"); 48 else ERR("Can't find envrion symbol");
49#else 49#else
50 env = environ; 50 loc_env = environ;
51#endif 51#endif
52 if (env) 52 if (loc_env)
53 { 53 {
54 char **p; 54 char **p;
55 55
56 for (p = env; *p; p++) 56 for (p = loc_env; *p; p++)
57 { 57 {
58 char **values; 58 char **values;
59 59
diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index 4a9ba48..9aa61aa 100644
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -120,25 +120,25 @@ _cb_thread_ctrl_out(void *data, const Efl_Event *event EINA_UNUSED)
120 Eina_Free_Cb free_func = cmd.d.ptr[2]; 120 Eina_Free_Cb free_func = cmd.d.ptr[2];
121 if (func) 121 if (func)
122 { 122 {
123 Efl_Event event = { obj, NULL, NULL }; 123 Efl_Event ev = { obj, NULL, NULL };
124 124
125 func(data, &event); 125 func(data, &ev);
126 } 126 }
127 if (free_func) free_func(data); 127 if (free_func) free_func(data);
128 } 128 }
129 else if (cmd.d.command == CMD_CALL_SYNC) 129 else if (cmd.d.command == CMD_CALL_SYNC)
130 { 130 {
131 EflThreadIOCallSync func = cmd.d.ptr[0]; 131 EflThreadIOCallSync func = cmd.d.ptr[0];
132 void *data = cmd.d.ptr[1]; 132 void *d = cmd.d.ptr[1];
133 Eina_Free_Cb free_func = cmd.d.ptr[2]; 133 Eina_Free_Cb free_func = cmd.d.ptr[2];
134 Control_Reply *rep = cmd.d.ptr[3]; 134 Control_Reply *rep = cmd.d.ptr[3];
135 if (func) 135 if (func)
136 { 136 {
137 Efl_Event event = { obj, NULL, NULL }; 137 Efl_Event ev = { obj, NULL, NULL };
138 138
139 rep->data = func(data, &event); 139 rep->data = func(d, &ev);
140 } 140 }
141 if (free_func) free_func(data); 141 if (free_func) free_func(d);
142 eina_semaphore_release(&(rep->sem), 1); 142 eina_semaphore_release(&(rep->sem), 1);
143 } 143 }
144 } 144 }
diff --git a/src/lib/elementary/efl_ui_format.c b/src/lib/elementary/efl_ui_format.c
index beb3945..2dff332 100644
--- a/src/lib/elementary/efl_ui_format.c
+++ b/src/lib/elementary/efl_ui_format.c
@@ -264,10 +264,10 @@ _efl_ui_format_formatted_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Format_Data *pd,
264 if (pd->format_values) 264 if (pd->format_values)
265 { 265 {
266 /* Search in the format_values array if we have one */ 266 /* Search in the format_values array if we have one */
267 Efl_Ui_Format_Value v = { 0 }; 267 Efl_Ui_Format_Value val = { 0 };
268 int ndx; 268 int ndx;
269 eina_value_int_convert(&value, &v.value); 269 eina_value_int_convert(&value, &val.value);
270 ndx = eina_inarray_search_sorted(pd->format_values, &v, (Eina_Compare_Cb)_value_compare); 270 ndx = eina_inarray_search_sorted(pd->format_values, &val, (Eina_Compare_Cb)_value_compare);
271 if (ndx > -1) { 271 if (ndx > -1) {
272 Efl_Ui_Format_Value *entry = eina_inarray_nth(pd->format_values, ndx); 272 Efl_Ui_Format_Value *entry = eina_inarray_nth(pd->format_values, ndx);
273 eina_strbuf_append(str, entry->text); 273 eina_strbuf_append(str, entry->text);
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index e2aed3c..a5efc38 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -3632,13 +3632,13 @@ static const Efl_Object_Property_Reflection*
3632_efl_class_reflection_find(const _Efl_Class *klass, const char *property_name) 3632_efl_class_reflection_find(const _Efl_Class *klass, const char *property_name)
3633{ 3633{
3634 const _Efl_Class **klass_iter = klass->extensions; 3634 const _Efl_Class **klass_iter = klass->extensions;
3635 const Efl_Object_Property_Reflection_Ops *ref = klass->reflection; 3635 const Efl_Object_Property_Reflection_Ops *ref_ops = klass->reflection;
3636 unsigned int i; 3636 unsigned int i;
3637 3637
3638 for (i = 0; ref && i < ref->count; ++i) 3638 for (i = 0; ref_ops && i < ref_ops->count; ++i)
3639 { 3639 {
3640 if (eina_streq(property_name, ref->table[i].property_name)) 3640 if (eina_streq(property_name, ref_ops->table[i].property_name))
3641 return &ref->table[i]; 3641 return &ref_ops->table[i];
3642 } 3642 }
3643 3643
3644 if (klass->parent) 3644 if (klass->parent)