bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=13a76dded08cf1bd55b42b867aaa524553edac6c
commit 13a76dded08cf1bd55b42b867aaa524553edac6c
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Tue Sep 1 13:23:42 2020 +0200
efl: resolve warnings over misleading code
this is meant to be like this, but clang thought of an intention mistake
here that went unsighted.
---
src/lib/eo/eo.c | 6 +++++-
src/lib/evas/canvas/evas_object_textblock.c | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index c3b6a8b6f7..1b9cdd9c9a 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -1721,7 +1721,9 @@ efl_class_new(const Efl_Class_Description *desc, const
Efl_Class *parent_id, ...
mro = eina_list_remove(mro, NULL);
mro = eina_list_prepend(mro, klass);
if ((desc->type == EFL_CLASS_TYPE_MIXIN) && (desc->data_size > 0))
- mixins = eina_list_prepend(mixins, klass);
+ {
+ mixins = eina_list_prepend(mixins, klass);
+ }
/* Copy the extensions and free the list */
{
@@ -1751,7 +1753,9 @@ efl_class_new(const Efl_Class_Description *desc, const
Efl_Class *parent_id, ...
size_t extn_data_off = klass->data_offset;
if (klass->desc->type != EFL_CLASS_TYPE_MIXIN)
+ {
extn_data_off += EO_ALIGN_SIZE(klass->desc->data_size);
+ }
/* Feed the mixins data offsets and free the mixins list. */
{
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index c3c1426ea7..5d1c476466 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -6647,7 +6647,9 @@ _layout_par(Ctxt *c)
it = _ITEM(eina_list_data_get(c->par->logical_items));
if (c->line_no == 0 || c->o->multiline)
- _layout_line_new(c, it->format);
+ {
+ _layout_line_new(c, it->format);
+ }
/* We walk on our own because we want to be able to add items from
* inside the list and then walk them on the next iteration. */
--
