From 63e94ecddf404ab4d7e40574685e81707d4ec388 Mon Sep 17 00:00:00 2001 From: hermet Date: Fri, 9 Mar 2012 13:02:16 +0000 Subject: [PATCH] elemenatry/index - removed unnecesary compare and return when realloc is failed git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69099 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_index.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index 90e478b..bd3c672 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -368,8 +368,8 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy) evas_object_geometry_get(wd->bx[i], &bx, &by, &bw, &bh); EINA_LIST_FOREACH(wd->items, l, it) { - if (!((it->level == i) && (VIEW(it)))) continue; - if ((VIEW(it)) && (it->level != wd->level)) + if (it->level != i) continue; + if (it->level != wd->level) { if (it->selected) { @@ -443,8 +443,8 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy) if (!label) label = strdup(last); else { - /* FIXME: realloc return NULL if the request fails */ label = realloc(label, strlen(label) + strlen(last) + 1); + if (!label) return; strcat(label, last); } free(last); @@ -452,6 +452,7 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy) } } } + if (!label) label = strdup(""); if (!last) last = strdup(""); edje_object_part_text_set(wd->base, "elm.text.body", label); -- 2.7.4