Skip to content

Commit 24771fb

Browse files
committed
Cleanup + max()
1 parent b7925cb commit 24771fb

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

ext/standard/array.c

+3-7
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ PHP_FUNCTION(min)
12331233
}
12341234
} else {
12351235
/* mixed min ( mixed $value1 , mixed $value2 [, mixed $value3... ] ) */
1236-
zval *min, result;
1236+
zval *min;
12371237
uint32_t i;
12381238

12391239
min = &args[0];
@@ -1283,9 +1283,6 @@ PHP_FUNCTION(min)
12831283
if (zend_compare(&args[i], min) < 0) {
12841284
min = &args[i];
12851285
}
1286-
if (Z_TYPE(result) == IS_TRUE) {
1287-
min = &args[i];
1288-
}
12891286
}
12901287
}
12911288

@@ -1323,7 +1320,7 @@ PHP_FUNCTION(max)
13231320
}
13241321
} else {
13251322
/* mixed max ( mixed $value1 , mixed $value2 [, mixed $value3... ] ) */
1326-
zval *max, result;
1323+
zval *max;
13271324
uint32_t i;
13281325

13291326
max = &args[0];
@@ -1370,8 +1367,7 @@ PHP_FUNCTION(max)
13701367
} else {
13711368
for (i = 1; i < argc; i++) {
13721369
generic_compare:
1373-
is_smaller_or_equal_function(&result, &args[i], max);
1374-
if (Z_TYPE(result) == IS_FALSE) {
1370+
if (zend_compare(&args[i], max) > 0) {
13751371
max = &args[i];
13761372
}
13771373
}

0 commit comments

Comments
 (0)