clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #60596: Code Cleanup Removing Superfluous If Statement

Browse Source 
Cleanup only, no function change. Patch by ircmaxell.
This commit is contained in:
Nikita Popov 2012-03-04 13:52:48 +00:00
parent 0fe734b7c8
commit 3bc1455496
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/spl/spl_engine.c
View File

@ -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;
}