Correct intdiv() argument names and description

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 83b977acf82fe08efb11619708c7fb3432840060..8da45c428768b838de00925983d788b48ca11c95 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1763,7 +1763,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_fmod, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_intdiv, 0)
-       ZEND_ARG_INFO(0, numerator)
+       ZEND_ARG_INFO(0, dividend)
        ZEND_ARG_INFO(0, divisor)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 9ab457b41dd12dae9ca930f095490526ae090266..6059f3dd9bb28a7432f8b4dbb9a666343608db8c 100644 (file)
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1456,27 +1456,27 @@ PHP_FUNCTION(fmod)
 }
 /* }}} */
 
-/* {{{ proto int intdiv(int numerator, int divisor)
-   Returns the integer division of the numerator by the divisor */
+/* {{{ proto int intdiv(int dividend, int divisor)
+   Returns the integer quotient of the division of dividend by divisor */
 PHP_FUNCTION(intdiv)
 {
-       zend_long numerator, divisor;
+       zend_long dividend, divisor;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &numerator, &divisor) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &dividend, &divisor) == FAILURE) {
                return;
        }
 
        if (divisor == 0) {
                zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Division by zero");
                return;
-       } else if (divisor == -1 && numerator == ZEND_LONG_MIN) {
+       } else if (divisor == -1 && dividend == ZEND_LONG_MIN) {
                /* Prevent overflow error/crash ... really should not happen:
                   We don't return a float here as that violates function contract */
                zend_throw_exception_ex(zend_ce_arithmetic_error, 0, "Division of PHP_INT_MIN by -1 is not an integer");
                return;
        }
 
-       RETURN_LONG(numerator / divisor);
+       RETURN_LONG(dividend / divisor);
 }
 /* }}} */