Skip to content

Commit f4fb771

Browse files
committed
Improve wording
1 parent 67bc4cf commit f4fb771

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Zend/tests/zend_ini_parse_quantity_error.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ foreach ($tests as $setting) {
1919
}
2020

2121
--EXPECTF--
22-
Warning: Invalid numeric string 'K': no valid leading digits, interpreting as '0' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
22+
Warning: Invalid quantity 'K': no valid leading digits, interpreting as '0' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
2323
int(0)
2424

25-
Warning: Invalid numeric string '1KM', interpreting as '1M' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
25+
Warning: Invalid quantity '1KM', interpreting as '1M' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
2626
int(1048576)
2727

28-
Warning: Invalid numeric string '1X': unknown multipler 'X', interpreting as '1' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
28+
Warning: Invalid quantity '1X': unknown multipler 'X', interpreting as '1' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
2929
int(1)
3030

31-
Warning: Invalid numeric string '1.0K', interpreting as '1K' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
31+
Warning: Invalid quantity '1.0K', interpreting as '1K' for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
3232
int(1024)

Zend/zend_ini.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ ZEND_API zend_long zend_ini_parse_quantity(zend_string *value, zend_string **err
559559
zend_ulong retval = (zend_ulong) ZEND_STRTOL(str, &digits_end, 0);
560560

561561
if (digits_end == str) {
562-
*errstr = zend_strpprintf(0, "Invalid numeric string '%.*s': no valid leading digits, interpreting as '0' for backwards compatibility",
562+
*errstr = zend_strpprintf(0, "Invalid quantity '%.*s': no valid leading digits, interpreting as '0' for backwards compatibility",
563563
(int)str_len, str);
564564
return 0;
565565
}
@@ -589,15 +589,15 @@ ZEND_API zend_long zend_ini_parse_quantity(zend_string *value, zend_string **err
589589
break;
590590
default:
591591
/* Unknown suffix */
592-
*errstr = zend_strpprintf(0, "Invalid numeric string '%.*s': unknown multipler '%c', interpreting as '%.*s' for backwards compatibility",
592+
*errstr = zend_strpprintf(0, "Invalid quantity '%.*s': unknown multipler '%c', interpreting as '%.*s' for backwards compatibility",
593593
(int)str_len, str, str[str_len-1], (int)(digits_end - str), str);
594594
return retval;
595595
}
596596
}
597597

598598
if (digits_end < &str[str_len-1]) {
599599
/* More than one character in suffix */
600-
*errstr = zend_strpprintf(0, "Invalid numeric string '%.*s', interpreting as '%.*s%c' for backwards compatibility",
600+
*errstr = zend_strpprintf(0, "Invalid quantity '%.*s', interpreting as '%.*s%c' for backwards compatibility",
601601
(int)str_len, str, (int)(digits_end - str), str, str[str_len-1]);
602602
return (zend_long) retval;
603603
}

0 commit comments

Comments
 (0)