svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_engine.c branches/PHP_5_4/ext/spl/spl_engine.c trunk/ext/spl/spl_engine.c

nikic Sun, 04 Mar 2012 13:52:48 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323863 Log: Fix bug #60596: Code Cleanup Removing Superfluous If Statement Cleanup only, no function change. Patch by ircmaxell. Bug: https://bugs.php.net/60596 (Open) Code Cleanup Removing Superfluous If Statement Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/spl_engine.c U php/php-src/branches/PHP_5_4/ext/spl/spl_engine.c U php/php-src/trunk/ext/spl/spl_engine.c Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_engine.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/spl_engine.c 2012-03-04 13:39:12 UTC (rev 323862) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_engine.c 2012-03-04 13:52:48 UTC (rev 323863) @@ -45,19 +45,16 @@ 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; } Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_engine.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/spl_engine.c 2012-03-04 13:39:12 UTC (rev 323862) +++ php/php-src/branches/PHP_5_4/ext/spl/spl_engine.c 2012-03-04 13:52:48 UTC (rev 323863) @@ -45,19 +45,16 @@ 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; } Modified: php/php-src/trunk/ext/spl/spl_engine.c =================================================================== --- php/php-src/trunk/ext/spl/spl_engine.c 2012-03-04 13:39:12 UTC (rev 323862) +++ php/php-src/trunk/ext/spl/spl_engine.c 2012-03-04 13:52:48 UTC (rev 323863) @@ -45,19 +45,16 @@ 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; }