com php-src: cleanup: win32/sendmail.c

Commit: ea689b96a7cc12f721aeb8938cfa6ebdb822edd5 Author: Anatol Belski <ab@php.net> Thu, 15 Jan 2015 15:16:25 +0100 Parents: 396e9cdb7fbb4d50eee0ed1d47a1c950f1569dda Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ea689b96a7cc12f721aeb8938cfa6ebdb822edd5 Log: cleanup Changed paths: M win32/sendmail.c Diff: diff --git a/win32/sendmail.c b/win32/sendmail.c index cc2cc43..0254d82 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -167,14 +167,12 @@ static zend_string *php_win32_mail_trim_header(char *header) ZVAL_STRINGL(&replace, PHP_WIN32_MAIL_UNIFY_REPLACE, strlen(PHP_WIN32_MAIL_UNIFY_REPLACE)); regex = zend_string_init(PHP_WIN32_MAIL_UNIFY_PATTERN, sizeof(PHP_WIN32_MAIL_UNIFY_PATTERN)-1, 0); -//zend_string *php_pcre_replace(zend_string *regex, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int limit, int *replace_count); - result = php_pcre_replace(regex, - header, (int)strlen(header), - &replace, - 0, - -1, - NULL); + header, (int)strlen(header), + &replace, + 0, + -1, + NULL); if (NULL == result) { zval_ptr_dtor(&replace); @@ -186,11 +184,11 @@ static zend_string *php_win32_mail_trim_header(char *header) regex = zend_string_init(PHP_WIN32_MAIL_RMVDBL_PATTERN, sizeof(PHP_WIN32_MAIL_RMVDBL_PATTERN)-1, 0); result2 = php_pcre_replace(regex, - result->val, (int)result->len, - &replace, - 0, - -1, - NULL); + result->val, (int)result->len, + &replace, + 0, + -1, + NULL); return result; #else /* In case we don't have PCRE support (for whatever reason...) simply do nothing and return the unmodified header */