@@ -48,15 +48,15 @@ static inline double php_intpow10(int power) {
48
48
49
49
/* {{{ php_round_helper
50
50
Actually performs the rounding of a value to integer in a certain mode */
51
- static inline double php_round_helper (double adjusted_value , double value , double coefficient , int mode ) {
51
+ static inline double php_round_helper (double adjusted_value , double value , double exponent , int mode ) {
52
52
double integral = adjusted_value >= 0.0 ? floor (adjusted_value ) : ceil (adjusted_value );
53
53
double value_abs = fabs (value );
54
54
double edge_case ;
55
55
56
56
if (fabs (adjusted_value ) >= value_abs ) {
57
- edge_case = fabs ((integral + copysign (0.5 , integral )) / coefficient );
57
+ edge_case = fabs ((integral + copysign (0.5 , integral )) / exponent );
58
58
} else {
59
- edge_case = fabs ((integral + copysign (0.5 , integral )) * coefficient );
59
+ edge_case = fabs ((integral + copysign (0.5 , integral )) * exponent );
60
60
}
61
61
62
62
switch (mode ) {
@@ -148,7 +148,7 @@ static inline double php_round_helper(double adjusted_value, double value, doubl
148
148
* mode. For the specifics of the algorithm, see http://wiki.php.net/rfc/rounding
149
149
*/
150
150
PHPAPI double _php_math_round (double value , int places , int mode ) {
151
- double f1 ;
151
+ double exponent ;
152
152
double tmp_value ;
153
153
154
154
if (!zend_finite (value ) || value == 0.0 ) {
@@ -157,28 +157,28 @@ PHPAPI double _php_math_round(double value, int places, int mode) {
157
157
158
158
places = places < INT_MIN + 1 ? INT_MIN + 1 : places ;
159
159
160
- f1 = php_intpow10 (abs (places ));
160
+ exponent = php_intpow10 (abs (places ));
161
161
162
162
/* adjust the value */
163
163
if (places >= 0 ) {
164
- tmp_value = value * f1 ;
164
+ tmp_value = value * exponent ;
165
165
} else {
166
- tmp_value = value / f1 ;
166
+ tmp_value = value / exponent ;
167
167
}
168
168
/* This value is beyond our precision, so rounding it is pointless */
169
169
if (fabs (tmp_value ) >= 1e15 ) {
170
170
return value ;
171
171
}
172
172
173
173
/* round the temp value */
174
- tmp_value = php_round_helper (tmp_value , value , f1 , mode );
174
+ tmp_value = php_round_helper (tmp_value , value , exponent , mode );
175
175
176
176
/* see if it makes sense to use simple division to round the value */
177
177
if (abs (places ) < 23 ) {
178
178
if (places > 0 ) {
179
- tmp_value = tmp_value / f1 ;
179
+ tmp_value = tmp_value / exponent ;
180
180
} else {
181
- tmp_value = tmp_value * f1 ;
181
+ tmp_value = tmp_value * exponent ;
182
182
}
183
183
} else {
184
184
/* Simple division can't be used since that will cause wrong results.
0 commit comments