Enlightenment CVS committal Author : raster Project : e17 Module : libs/edje
Dir : e17/libs/edje/src/lib Modified Files: edje_match.c Log Message: fix valgrind warning in match code =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/edje_match.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- edje_match.c 10 Apr 2008 08:58:19 -0000 1.6 +++ edje_match.c 17 Apr 2008 01:13:48 -0000 1.7 @@ -68,7 +68,7 @@ ALIGN(struct_size); struct_size += states_has_size; - l = malloc(n * struct_size); + l = calloc(1, n * struct_size); if (!l) return 0; ppat->states = l; @@ -92,19 +92,21 @@ size_t idx, size_t pos) { - { - const size_t i = idx * (patterns_max_length + 1) + pos; - - if (list->size > i && list->has[i]) return; - list->has[i] = 1; - } - - const size_t i = list->size; + size_t i; + i = (idx * (patterns_max_length + 1)) + pos; + + if (list->size > i) + { + if (list->has[i]) return; + } + list->has[i] = 1; + + i = list->size; list->states[i].idx = idx; list->states[i].pos = pos; list->has[i] = 0; - ++list->size; + list->size++; } static void @@ -118,11 +120,11 @@ /* Token manipulation. */ enum status - { - patterns_not_found = 0, - patterns_found = 1, - patterns_syntax_error = 2 - }; +{ + patterns_not_found = 0, + patterns_found = 1, + patterns_syntax_error = 2 +}; static size_t _edje_match_patterns_exec_class_token(enum status *status, ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs