--- embedaddon/php/ext/spl/spl_engine.c 2012/02/21 23:48:01 1.1.1.1 +++ embedaddon/php/ext/spl/spl_engine.c 2012/05/29 12:34:42 1.1.1.2 @@ -45,19 +45,16 @@ PHPAPI void spl_instantiate(zend_class_entry *pce, zva 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; }