mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Fix bug #60596: Code Cleanup Removing Superfluous If Statement
Cleanup only, no function change. Patch by ircmaxell.
This commit is contained in:
parent
0fe734b7c8
commit
3bc1455496
@ -45,19 +45,16 @@ PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRM
|
||||
|
||||
PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
switch(Z_TYPE_P(offset)) {
|
||||
switch (Z_TYPE_P(offset)) {
|
||||
case IS_STRING:
|
||||
ZEND_HANDLE_NUMERIC(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, idx);
|
||||
break;
|
||||
case IS_DOUBLE:
|
||||
return (long)Z_DVAL_P(offset);
|
||||
case IS_RESOURCE:
|
||||
case IS_BOOL:
|
||||
case IS_LONG:
|
||||
if (Z_TYPE_P(offset) == IS_DOUBLE) {
|
||||
return (long)Z_DVAL_P(offset);
|
||||
} else {
|
||||
return Z_LVAL_P(offset);
|
||||
}
|
||||
return Z_LVAL_P(offset);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user