From fa23bebe94d7149d7bb55d3482f4802546198c24 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Tue, 6 Oct 2015 16:12:48 +0100 Subject: [PATCH] Correct intdiv() argument names and description --- ext/standard/basic_functions.c | 2 +- ext/standard/math.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 83b977acf8..8da45c4287 100644 --- 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 9ab457b41d..6059f3dd9b 100644 --- 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", ÷nd, &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); } /* }}} */ -- 2.49.0