From: Enlightenment S. <no-...@en...> - 2012-05-04 10:10:36
|
Log: Evas textblock: Warnings - go away and please don't stay. Author: tasn Date: 2012-05-04 03:10:29 -0700 (Fri, 04 May 2012) New Revision: 70757 Trac: http://trac.enlightenment.org/e/changeset/70757 Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2012-05-04 09:38:52 UTC (rev 70756) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2012-05-04 10:10:29 UTC (rev 70757) @@ -7365,7 +7365,6 @@ if (!cur) return EINA_FALSE; if (!cur->node) return EINA_FALSE; - if (cur->pos < 0) return EINA_FALSE; text = eina_ustrbuf_string_get(cur->node->unicode); if ((cur->pos - 1) > eina_ustrbuf_length_get(cur->node->unicode)) return EINA_FALSE; return ((text[cur->pos] == 0) && (!EINA_INLIST_GET(cur->node)->next)) ? @@ -7943,12 +7942,12 @@ Eina_List *ret = NULL; Evas_Object_Textblock_Node_Text *n1, *n2; Evas_Object_Textblock_Node_Format *first, *last; - TB_HEAD_RETURN(NULL); if (!cur1 || !cur1->node) return NULL; if (!cur2 || !cur2->node) return NULL; if (cur1->obj != cur2->obj) return NULL; obj = cur1->obj; + TB_HEAD_RETURN(NULL); if (evas_textblock_cursor_compare(cur1, cur2) > 0) { @@ -8397,7 +8396,7 @@ EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { - if (!cur) -1; + if (!cur) return -1; return _evas_textblock_cursor_char_pen_geometry_common_get( cur->ENFN->font_char_coords_get, cur, cx, cy, cw, ch); } @@ -8405,7 +8404,7 @@ EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { - if (!cur) -1; + if (!cur) return -1; return _evas_textblock_cursor_char_pen_geometry_common_get( cur->ENFN->font_pen_coords_get, cur, cx, cy, cw, ch); } |