summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-07-07 12:43:39 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-07-07 12:43:39 +0100
commitcd27255cb05e8fabd4d7b1d7489c3296e374db03 (patch)
tree9e1389c82bdba9145003e4f4a9b333fcbb5ea69c
parent704d58d658ed4424a886c127f3bbe83afde1f2a1 (diff)
Revert "edje: Avoid string duplication when possible."
This reverts commit 704d58d658ed4424a886c127f3bbe83afde1f2a1. gee. it looked innocent enough... it broke tests and everything in e
-rw-r--r--src/lib/edje/edje_util.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 33d00488e5..4d9a9dc369 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5602,23 +5602,17 @@ _edje_real_part_text_text_source_description_get(Edje_Real_Part *ep, Edje_Real_P
5602Edje_Real_Part * 5602Edje_Real_Part *
5603_edje_real_part_recursive_get(Edje **ed, const char *part) 5603_edje_real_part_recursive_get(Edje **ed, const char *part)
5604{ 5604{
5605 if ((*ed)->collection && (*ed)->collection->alias) 5605 Edje_Real_Part *rp;
5606 { 5606 char **path;
5607 Edje_Real_Part *rp;
5608 char **path;
5609
5610 path = eina_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0);
5611 if (!path) return NULL;
5612
5613 rp = _edje_real_part_recursive_get_helper(ed, path);
5614 5607
5615 free(*path); 5608 path = eina_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0);
5616 free(path); 5609 if (!path) return NULL;
5617 5610
5618 return rp; 5611 rp = _edje_real_part_recursive_get_helper(ed, path);
5619 }
5620 5612
5621 return _edje_real_part_get(*ed, part);; 5613 free(*path);
5614 free(path);
5615 return rp;
5622} 5616}
5623 5617
5624Evas_Object * 5618Evas_Object *