@@ -140,33 +140,33 @@ static zend_string *php_win32_mail_trim_header(const char *header)
140140 return NULL ;
141141 }
142142
143- replace = zend_string_init (PHP_WIN32_MAIL_UNIFY_REPLACE , strlen ( PHP_WIN32_MAIL_UNIFY_REPLACE ), 0 );
144- regex = zend_string_init (PHP_WIN32_MAIL_UNIFY_PATTERN , sizeof ( PHP_WIN32_MAIL_UNIFY_PATTERN ) - 1 , 0 );
143+ replace = ZSTR_INIT_LITERAL (PHP_WIN32_MAIL_UNIFY_REPLACE , false );
144+ regex = ZSTR_INIT_LITERAL (PHP_WIN32_MAIL_UNIFY_PATTERN , false );
145145
146146 result = php_pcre_replace (regex ,
147147 NULL , header , strlen (header ),
148148 replace ,
149149 -1 ,
150150 NULL );
151151
152- zend_string_release_ex (replace , 0 );
153- zend_string_release_ex (regex , 0 );
152+ zend_string_release_ex (replace , false );
153+ zend_string_release_ex (regex , false );
154154
155155 if (NULL == result ) {
156156 return NULL ;
157157 }
158158
159- replace = zend_string_init (PHP_WIN32_MAIL_RMVDBL_PATTERN , strlen ( PHP_WIN32_MAIL_RMVDBL_PATTERN ), 0 );
160- regex = zend_string_init (PHP_WIN32_MAIL_RMVDBL_PATTERN , sizeof ( PHP_WIN32_MAIL_RMVDBL_PATTERN ) - 1 , 0 );
159+ replace = ZSTR_INIT_LITERAL (PHP_WIN32_MAIL_RMVDBL_PATTERN , false );
160+ regex = ZSTR_INIT_LITERAL (PHP_WIN32_MAIL_RMVDBL_PATTERN , false );
161161
162162 result2 = php_pcre_replace (regex ,
163163 result , ZSTR_VAL (result ), ZSTR_LEN (result ),
164164 replace ,
165165 -1 ,
166166 NULL );
167- zend_string_release_ex (replace , 0 );
168- zend_string_release_ex (regex , 0 );
169- zend_string_release_ex (result , 0 );
167+ zend_string_release_ex (replace , false );
168+ zend_string_release_ex (regex , false );
169+ zend_string_release_ex (result , false );
170170
171171 return result2 ;
172172}
0 commit comments