summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-09-01 13:23:42 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-09-01 14:12:31 +0200
commit13a76dded08cf1bd55b42b867aaa524553edac6c (patch)
treec7739633a7d56b06a9ccda41f8b1d2d4cae1bbe9
parent9673ed6269c6286ffa4828a86a960143afaa7482 (diff)
efl: resolve warnings over misleading code
this is meant to be like this, but clang thought of an intention mistake here that went unsighted.
-rw-r--r--src/lib/eo/eo.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
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, ...
1721 mro = eina_list_remove(mro, NULL); 1721 mro = eina_list_remove(mro, NULL);
1722 mro = eina_list_prepend(mro, klass); 1722 mro = eina_list_prepend(mro, klass);
1723 if ((desc->type == EFL_CLASS_TYPE_MIXIN) && (desc->data_size > 0)) 1723 if ((desc->type == EFL_CLASS_TYPE_MIXIN) && (desc->data_size > 0))
1724 mixins = eina_list_prepend(mixins, klass); 1724 {
1725 mixins = eina_list_prepend(mixins, klass);
1726 }
1725 1727
1726 /* Copy the extensions and free the list */ 1728 /* Copy the extensions and free the list */
1727 { 1729 {
@@ -1751,7 +1753,9 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...
1751 1753
1752 size_t extn_data_off = klass->data_offset; 1754 size_t extn_data_off = klass->data_offset;
1753 if (klass->desc->type != EFL_CLASS_TYPE_MIXIN) 1755 if (klass->desc->type != EFL_CLASS_TYPE_MIXIN)
1756 {
1754 extn_data_off += EO_ALIGN_SIZE(klass->desc->data_size); 1757 extn_data_off += EO_ALIGN_SIZE(klass->desc->data_size);
1758 }
1755 1759
1756 /* Feed the mixins data offsets and free the mixins list. */ 1760 /* Feed the mixins data offsets and free the mixins list. */
1757 { 1761 {
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)
6647 6647
6648 it = _ITEM(eina_list_data_get(c->par->logical_items)); 6648 it = _ITEM(eina_list_data_get(c->par->logical_items));
6649 if (c->line_no == 0 || c->o->multiline) 6649 if (c->line_no == 0 || c->o->multiline)
6650 _layout_line_new(c, it->format); 6650 {
6651 _layout_line_new(c, it->format);
6652 }
6651 /* We walk on our own because we want to be able to add items from 6653 /* We walk on our own because we want to be able to add items from
6652 * inside the list and then walk them on the next iteration. */ 6654 * inside the list and then walk them on the next iteration. */
6653 6655