From 5bfa70242fb1f579e33cd02d0a4088387176ba7c Mon Sep 17 00:00:00 2001 From: SVN Migration Date: Sun, 25 Jul 1999 15:06:50 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'BEFORE_NEW_OPERATOR_FIX'. --- Zend/zend_operators.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Zend/zend_operators.c') diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index d73feecd83..a8bd01892e 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -162,34 +162,29 @@ ZEND_API void convert_to_long_base(zval *op, int base) case IS_BOOL: case IS_RESOURCE: case IS_LONG: - return; + break; case IS_DOUBLE: op->value.lval = (long) op->value.dval; - op->type = IS_LONG; break; case IS_STRING: strval = op->value.str.val; op->value.lval = strtol(strval, NULL, base); - op->type = IS_LONG; STR_FREE(strval); break; case IS_ARRAY: tmp = (zend_hash_num_elements(op->value.ht)?1:0); zval_dtor(op); op->value.lval = tmp; - op->type = IS_LONG; break; case IS_OBJECT: tmp = (zend_hash_num_elements(op->value.obj.properties)?1:0); zval_dtor(op); op->value.lval = tmp; - op->type = IS_LONG; break; default: zend_error(E_WARNING, "Cannot convert to ordinal value"); zval_dtor(op); op->value.lval = 0; - op->type = IS_LONG; break; } -- cgit v1.2.1