Skip to content

Commit 0d79226

Browse files
committed
Update tostring_001.phpt
2 parents bb21510 + 75c7719 commit 0d79226

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/standard/string.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ static inline zend_result php_charmask(const unsigned char *input, size_t len, c
519519
* mode 1 : trim left
520520
* mode 2 : trim right
521521
* mode 3 : trim left and right
522-
* what indicates which chars are to be trimmed. NULL->default (' \t\n\r\v\0')
522+
* what indicates which chars are to be trimmed. NULL->default (' \f\t\n\r\v\0')
523523
*/
524524
static zend_always_inline zend_string *php_trim_int(zend_string *str, const char *what, size_t what_len, int mode)
525525
{
@@ -576,7 +576,7 @@ static zend_always_inline zend_string *php_trim_int(zend_string *str, const char
576576
unsigned char c = (unsigned char)*start;
577577

578578
if (c <= ' ' &&
579-
(c == ' ' || c == '\n' || c == '\r' || c == '\t' || c == '\v' || c == '\f' || c == '\0')) {
579+
(c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v' || c == '\0')) {
580580
start++;
581581
} else {
582582
break;
@@ -588,7 +588,7 @@ static zend_always_inline zend_string *php_trim_int(zend_string *str, const char
588588
unsigned char c = (unsigned char)*(end-1);
589589

590590
if (c <= ' ' &&
591-
(c == ' ' || c == '\n' || c == '\r' || c == '\t' || c == '\v' || c == '\f' || c == '\0')) {
591+
(c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v' || c == '\0')) {
592592
end--;
593593
} else {
594594
break;
@@ -611,7 +611,7 @@ static zend_always_inline zend_string *php_trim_int(zend_string *str, const char
611611
* mode 1 : trim left
612612
* mode 2 : trim right
613613
* mode 3 : trim left and right
614-
* what indicates which chars are to be trimmed. NULL->default (' \t\n\r\v\0')
614+
* what indicates which chars are to be trimmed. NULL->default (' \f\t\n\r\v\0')
615615
*/
616616
PHPAPI zend_string *php_trim(zend_string *str, const char *what, size_t what_len, int mode)
617617
{

0 commit comments

Comments
 (0)