From 7def9a78655b28cbfe3da3e57dda59a82f698355 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Fri, 22 Jul 2016 19:03:42 +0900 Subject: [PATCH] edc_parser: Fix to parse "#define" expression correctly. Update pointer after parsing "#define" expression. Parse other expressions after parsing "#define" expression. --- src/lib/edc_parser.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 9adedff..698f1e1 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -1656,16 +1656,17 @@ parser_first_group_name_get(parser_data *pd EINA_UNUSED, Evas_Object *entry) while (p < (utf8 + utf8_len)) { - char *slash = strstr(p, "\\"); - if (!slash) break; - char *eol = strstr(p, "\n"); if (!eol) goto end; - if (eol < slash) break; + char *slash = strstr(p, "\\"); p = eol + 1; + + if (!slash || (eol < slash)) + break; } + continue; } //group? @@ -1940,16 +1941,17 @@ parser_group_list_get(parser_data *pd, Evas_Object *entry) while (p < (utf8 + utf8_len)) { - char *slash = strstr(p, "\\"); - if (!slash) break; - char *eol = strstr(p, "\n"); if (!eol) goto end; - if (eol < slash) break; + char *slash = strstr(p, "\\"); p = eol + 1; + + if (!slash || (eol < slash)) + break; } + continue; } //group?