Skip to content

Commit 058756b

Browse files
committed
Remove the convert_to_long_base function
This function is unused in php-src, and has somewhat dubious semantics, especially since we switched convert_to_long to not use strtol for the base 10 case. If you want to convert strings from a different base, use ZEND_STRTOL directly.
1 parent 0ec34da commit 058756b

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

Zend/zend_operators.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -423,14 +423,6 @@ static zend_never_inline zend_long ZEND_FASTCALL zendi_try_get_long(zval *op, ze
423423
} while (0);
424424

425425
ZEND_API void ZEND_FASTCALL convert_to_long(zval *op) /* {{{ */
426-
{
427-
if (Z_TYPE_P(op) != IS_LONG) {
428-
convert_to_long_base(op, 10);
429-
}
430-
}
431-
/* }}} */
432-
433-
ZEND_API void ZEND_FASTCALL convert_to_long_base(zval *op, int base) /* {{{ */
434426
{
435427
zend_long tmp;
436428

@@ -456,11 +448,7 @@ ZEND_API void ZEND_FASTCALL convert_to_long_base(zval *op, int base) /* {{{ */
456448
case IS_STRING:
457449
{
458450
zend_string *str = Z_STR_P(op);
459-
if (base == 10) {
460-
ZVAL_LONG(op, zval_get_long(op));
461-
} else {
462-
ZVAL_LONG(op, ZEND_STRTOL(ZSTR_VAL(str), NULL, base));
463-
}
451+
ZVAL_LONG(op, zval_get_long(op));
464452
zend_string_release_ex(str, 0);
465453
}
466454
break;

Zend/zend_operators.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ ZEND_API void ZEND_FASTCALL convert_scalar_to_number(zval *op);
262262
ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op);
263263
ZEND_API void ZEND_FASTCALL convert_to_long(zval *op);
264264
ZEND_API void ZEND_FASTCALL convert_to_double(zval *op);
265-
ZEND_API void ZEND_FASTCALL convert_to_long_base(zval *op, int base);
266265
ZEND_API void ZEND_FASTCALL convert_to_null(zval *op);
267266
ZEND_API void ZEND_FASTCALL convert_to_boolean(zval *op);
268267
ZEND_API void ZEND_FASTCALL convert_to_array(zval *op);

0 commit comments

Comments
 (0)