Commit: 6ee260231741085f204ea79248c21d3e66dc4c93 Author: Dmitry Stogov <dmi...@zend.com> Tue, 19 Feb 2013 18:15:11 +0400 Parents: 4813a711749df756088f049cadb58f13fe60721d Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ee260231741085f204ea79248c21d3e66dc4c93 Log: Simplification Changed paths: M zend_accelerator_blacklist.c Diff: diff --git a/zend_accelerator_blacklist.c b/zend_accelerator_blacklist.c index 804124b..666304b 100644 --- a/zend_accelerator_blacklist.c +++ b/zend_accelerator_blacklist.c @@ -76,7 +76,7 @@ static void zend_accel_blacklist_update_regexp(zend_blacklist *blacklist) { int i, end=0, j, rlen=6, clen, reg_err; char *regexp; - zend_regexp_list **regexp_list_it; + zend_regexp_list **regexp_list_it, *it; if (blacklist->pos == 0) { /* we have no blacklist to talk about */ @@ -115,21 +115,22 @@ static void zend_accel_blacklist_update_regexp(zend_blacklist *blacklist) regexp[clen++] = ')'; regexp[clen] = '\0'; - (*regexp_list_it) = malloc(sizeof(zend_regexp_list)); - if (!*regexp_list_it) { + it = (zend_regexp_list*)malloc(sizeof(zend_regexp_list)); + if (!it) { zend_accel_error(ACCEL_LOG_ERROR, "malloc() failed\n"); return; } - (*regexp_list_it)->next = NULL; + it->next = NULL; - if ((reg_err = regcomp(&((*regexp_list_it)->comp_regex), regexp, REGEX_MODE)) != 0) { - blacklist_report_regexp_error(&((*regexp_list_it)->comp_regex), reg_err); + if ((reg_err = regcomp(&it->comp_regex, regexp, REGEX_MODE)) != 0) { + blacklist_report_regexp_error(&it->comp_regex, reg_err); } /* prepare for the next iteration */ free(regexp); end = i+1; rlen = 6; - regexp_list_it = &((*regexp_list_it)->next); + *regexp_list_it = it; + regexp_list_it = &it->next; } } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
