dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need for extra nul byte check - while terminated IF its null. so known 

condition. formatting too.


SVN revision: 30923
This commit is contained in:
Carsten Haitzler 2007-07-21 03:06:08 +00:00
parent b4ab277e21
commit be1ba8873b
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -2423,11 +2423,8 @@ evas_object_textblock_style_get(Evas_Object *obj)
static inline void static inline void
_advance_after_end_of_string(const char **p_buf) _advance_after_end_of_string(const char **p_buf)
{ {
while (**p_buf != '\0') while (**p_buf != 0) (*p_buf)++;
(*p_buf)++; (*p_buf)++;
if (**p_buf == '\0')
(*p_buf)++;
} }
static inline int static inline int
@ -2435,12 +2432,14 @@ _is_eq_and_advance(const char *s, const char *s_end,
const char **p_m, const char *m_end) const char **p_m, const char *m_end)
{ {
for (;((s < s_end) && (*p_m < m_end)); s++, (*p_m)++) for (;((s < s_end) && (*p_m < m_end)); s++, (*p_m)++)
if (*s != **p_m) {
{ if (*s != **p_m)
_advance_after_end_of_string(p_m); {
return 0; _advance_after_end_of_string(p_m);
} return 0;
}
}
if (*p_m < m_end) if (*p_m < m_end)
_advance_after_end_of_string(p_m); _advance_after_end_of_string(p_m);
@ -2463,7 +2462,7 @@ _append_escaped_char(Evas_Textblock_Cursor *cur, const char *s,
evas_textblock_cursor_text_append(cur, map_itr); evas_textblock_cursor_text_append(cur, map_itr);
return; return;
} }
if (map_itr < map_itr) if (map_itr < map_itr)
_advance_after_end_of_string(&map_itr); _advance_after_end_of_string(&map_itr);
} }