Skip to content

Commit 03fda30

Browse files
committed
Rename variables
1 parent a21d279 commit 03fda30

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

ext/standard/array.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,14 +2670,14 @@ PHP_FUNCTION(array_fill_keys)
26702670
/* {{{ Create an array containing the range of integers or characters from low to high (inclusive) */
26712671
PHP_FUNCTION(range)
26722672
{
2673-
zval *zlow, *zhigh, *user_step = NULL, tmp;
2673+
zval *user_start, *user_end, *user_step = NULL, tmp;
26742674
bool err = 0, is_step_double = false;
26752675
double step_double = 1.0;
26762676
zend_long step = 1;
26772677

26782678
ZEND_PARSE_PARAMETERS_START(2, 3)
2679-
Z_PARAM_NUMBER_OR_STR(zlow)
2680-
Z_PARAM_NUMBER_OR_STR(zhigh)
2679+
Z_PARAM_NUMBER_OR_STR(user_start)
2680+
Z_PARAM_NUMBER_OR_STR(user_end)
26812681
Z_PARAM_OPTIONAL
26822682
Z_PARAM_NUMBER(user_step)
26832683
ZEND_PARSE_PARAMETERS_END();
@@ -2718,21 +2718,21 @@ PHP_FUNCTION(range)
27182718
}
27192719

27202720
/* If the range is given as strings, generate an array of characters. */
2721-
if (Z_TYPE_P(zlow) == IS_STRING && Z_TYPE_P(zhigh) == IS_STRING && Z_STRLEN_P(zlow) >= 1 && Z_STRLEN_P(zhigh) >= 1) {
2721+
if (Z_TYPE_P(user_start) == IS_STRING && Z_TYPE_P(user_end) == IS_STRING && Z_STRLEN_P(user_start) >= 1 && Z_STRLEN_P(user_end) >= 1) {
27222722
int type1, type2;
27232723
unsigned char low, high;
27242724

2725-
type1 = is_numeric_string(Z_STRVAL_P(zlow), Z_STRLEN_P(zlow), NULL, NULL, 0);
2726-
type2 = is_numeric_string(Z_STRVAL_P(zhigh), Z_STRLEN_P(zhigh), NULL, NULL, 0);
2725+
type1 = is_numeric_string(Z_STRVAL_P(user_start), Z_STRLEN_P(user_start), NULL, NULL, 0);
2726+
type2 = is_numeric_string(Z_STRVAL_P(user_end), Z_STRLEN_P(user_end), NULL, NULL, 0);
27272727

27282728
if (type1 == IS_DOUBLE || type2 == IS_DOUBLE || is_step_double) {
27292729
goto double_str;
27302730
} else if (type1 == IS_LONG || type2 == IS_LONG) {
27312731
goto long_str;
27322732
}
27332733

2734-
low = (unsigned char)Z_STRVAL_P(zlow)[0];
2735-
high = (unsigned char)Z_STRVAL_P(zhigh)[0];
2734+
low = (unsigned char)Z_STRVAL_P(user_start)[0];
2735+
high = (unsigned char)Z_STRVAL_P(user_end)[0];
27362736

27372737
if (low > high) { /* Negative Steps */
27382738
if (low - high < step) {
@@ -2772,12 +2772,12 @@ PHP_FUNCTION(range)
27722772
ZVAL_CHAR(&tmp, low);
27732773
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
27742774
}
2775-
} else if (Z_TYPE_P(zlow) == IS_DOUBLE || Z_TYPE_P(zhigh) == IS_DOUBLE || is_step_double) {
2775+
} else if (Z_TYPE_P(user_start) == IS_DOUBLE || Z_TYPE_P(user_end) == IS_DOUBLE || is_step_double) {
27762776
double low, high, element;
27772777
uint32_t i, size;
27782778
double_str:
2779-
low = zval_get_double(zlow);
2780-
high = zval_get_double(zhigh);
2779+
low = zval_get_double(user_start);
2780+
high = zval_get_double(user_end);
27812781

27822782
if (zend_isinf(high) || zend_isinf(low)) {
27832783
zend_value_error("Invalid range supplied: start=%0.0f end=%0.0f", low, high);
@@ -2823,8 +2823,8 @@ PHP_FUNCTION(range)
28232823
zend_ulong unsigned_step;
28242824
uint32_t i, size;
28252825
long_str:
2826-
low = zval_get_long(zlow);
2827-
high = zval_get_long(zhigh);
2826+
low = zval_get_long(user_start);
2827+
high = zval_get_long(user_end);
28282828

28292829
unsigned_step = (zend_ulong)step;
28302830

0 commit comments

Comments
 (0)