summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c6
-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
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c6
-rw-r--r--src/modules/evas/image_loaders/png/evas_image_load_png.c12
7 files changed, 33 insertions, 27 deletions
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index 63a6419..e4fa8c9 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -18,14 +18,14 @@ typedef enum {
18static void 18static void
19_btn_color_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) 19_btn_color_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
20{ 20{
21 Eo *layout = data; 21 Eo *l = data;
22 22
23 static Eina_Bool changed = EINA_TRUE; 23 static Eina_Bool changed = EINA_TRUE;
24 24
25 if (changed) 25 if (changed)
26 efl_gfx_color_set(layout, 0, 88, 204, 255); 26 efl_gfx_color_set(l, 0, 88, 204, 255);
27 else 27 else
28 efl_gfx_color_set(layout, 255, 255, 255, 255); 28 efl_gfx_color_set(l, 255, 255, 255, 255);
29 29
30 changed = !changed; 30 changed = !changed;
31} 31}
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)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 1494a88..30a95ee 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -2831,6 +2831,7 @@ _normal_gles3_api_get(Evas_GL_API *funcs, int minor_version)
2831 ORD(glTexBuffer); 2831 ORD(glTexBuffer);
2832 ORD(glTexBufferRange); 2832 ORD(glTexBufferRange);
2833 ORD(glTexStorage3DMultisample); 2833 ORD(glTexStorage3DMultisample);
2834 EINA_FALLTHROUGH;
2834 case 1: 2835 case 1:
2835 ORD(glDispatchCompute); 2836 ORD(glDispatchCompute);
2836 ORD(glDispatchComputeIndirect); 2837 ORD(glDispatchComputeIndirect);
@@ -2900,6 +2901,7 @@ _normal_gles3_api_get(Evas_GL_API *funcs, int minor_version)
2900 ORD(glVertexAttribIFormat); 2901 ORD(glVertexAttribIFormat);
2901 ORD(glVertexAttribBinding); 2902 ORD(glVertexAttribBinding);
2902 ORD(glVertexBindingDivisor); 2903 ORD(glVertexBindingDivisor);
2904 EINA_FALLTHROUGH;
2903 case 0: 2905 case 0:
2904 ORD(glBeginQuery); 2906 ORD(glBeginQuery);
2905 ORD(glBeginTransformFeedback); 2907 ORD(glBeginTransformFeedback);
@@ -3209,6 +3211,7 @@ _debug_gles3_api_get(Evas_GL_API *funcs, int minor_version)
3209 ORD(glTexBuffer); 3211 ORD(glTexBuffer);
3210 ORD(glTexBufferRange); 3212 ORD(glTexBufferRange);
3211 ORD(glTexStorage3DMultisample); 3213 ORD(glTexStorage3DMultisample);
3214 EINA_FALLTHROUGH;
3212 case 1: 3215 case 1:
3213 ORD(glDispatchCompute); 3216 ORD(glDispatchCompute);
3214 ORD(glDispatchComputeIndirect); 3217 ORD(glDispatchComputeIndirect);
@@ -3278,6 +3281,7 @@ _debug_gles3_api_get(Evas_GL_API *funcs, int minor_version)
3278 ORD(glVertexAttribIFormat); 3281 ORD(glVertexAttribIFormat);
3279 ORD(glVertexAttribBinding); 3282 ORD(glVertexAttribBinding);
3280 ORD(glVertexBindingDivisor); 3283 ORD(glVertexBindingDivisor);
3284 EINA_FALLTHROUGH;
3281 case 0: 3285 case 0:
3282 ORD(glBeginQuery); 3286 ORD(glBeginQuery);
3283 ORD(glBeginTransformFeedback); 3287 ORD(glBeginTransformFeedback);
@@ -3455,6 +3459,7 @@ _evgl_load_gles3_apis(void *dl_handle, Evas_GL_API *funcs, int minor_version,
3455 ORD(glTexBuffer); 3459 ORD(glTexBuffer);
3456 ORD(glTexBufferRange); 3460 ORD(glTexBufferRange);
3457 ORD(glTexStorage3DMultisample); 3461 ORD(glTexStorage3DMultisample);
3462 EINA_FALLTHROUGH;
3458 case 1: 3463 case 1:
3459 ORD(glDispatchCompute); 3464 ORD(glDispatchCompute);
3460 ORD(glDispatchComputeIndirect); 3465 ORD(glDispatchComputeIndirect);
@@ -3524,6 +3529,7 @@ _evgl_load_gles3_apis(void *dl_handle, Evas_GL_API *funcs, int minor_version,
3524 ORD(glVertexAttribIFormat); 3529 ORD(glVertexAttribIFormat);
3525 ORD(glVertexAttribBinding); 3530 ORD(glVertexAttribBinding);
3526 ORD(glVertexBindingDivisor); 3531 ORD(glVertexBindingDivisor);
3532 EINA_FALLTHROUGH;
3527 case 0: 3533 case 0:
3528 ORD(glBeginQuery); 3534 ORD(glBeginQuery);
3529 ORD(glBeginTransformFeedback); 3535 ORD(glBeginTransformFeedback);
diff --git a/src/modules/evas/image_loaders/png/evas_image_load_png.c b/src/modules/evas/image_loaders/png/evas_image_load_png.c
index 4ffd564..732bd94 100644
--- a/src/modules/evas/image_loaders/png/evas_image_load_png.c
+++ b/src/modules/evas/image_loaders/png/evas_image_load_png.c
@@ -804,15 +804,15 @@ evas_image_load_file_data_png(void *loader_data,
804 //general case: 4 bytes pixel. 804 //general case: 4 bytes pixel.
805 if (pack_offset == sizeof(DATA32)) 805 if (pack_offset == sizeof(DATA32))
806 { 806 {
807 DATA32 *dst_ptr = (DATA32 *) surface; 807 DATA32 *dst_ptr2 = (DATA32 *) surface;
808 DATA32 *src_ptr2 = (DATA32 *) src_ptr; 808 DATA32 *src_ptr2 = (DATA32 *) src_ptr;
809 809
810 for (i = 0; i < h; i++) 810 for (i = 0; i < h; i++)
811 { 811 {
812 for (j = 0; j < w; j++) 812 for (j = 0; j < w; j++)
813 { 813 {
814 *dst_ptr = *src_ptr2; 814 *dst_ptr2 = *src_ptr2;
815 ++dst_ptr; 815 ++dst_ptr2;
816 src_ptr2 += scale_ratio; 816 src_ptr2 += scale_ratio;
817 } 817 }
818 src_ptr2 += scale_ratio * image_w; 818 src_ptr2 += scale_ratio * image_w;
@@ -820,15 +820,15 @@ evas_image_load_file_data_png(void *loader_data,
820 } 820 }
821 else 821 else
822 { 822 {
823 unsigned char *dst_ptr = surface; 823 unsigned char *dst_ptr2 = surface;
824 824
825 for (i = 0; i < h; i++) 825 for (i = 0; i < h; i++)
826 { 826 {
827 for (j = 0; j < w; j++) 827 for (j = 0; j < w; j++)
828 { 828 {
829 for (k = 0; k < (int)pack_offset; k++) 829 for (k = 0; k < (int)pack_offset; k++)
830 dst_ptr[k] = src_ptr[k + scale_ratio * j * pack_offset]; 830 dst_ptr2[k] = src_ptr[k + scale_ratio * j * pack_offset];
831 dst_ptr += pack_offset; 831 dst_ptr2 += pack_offset;
832 } 832 }
833 src_ptr += scale_ratio * image_w * pack_offset; 833 src_ptr += scale_ratio * image_w * pack_offset;
834 } 834 }