diff options
author | SVN Migration <svn@php.net> | 1999-07-25 15:06:50 +0000 |
---|---|---|
committer | SVN Migration <svn@php.net> | 1999-07-25 15:06:50 +0000 |
commit | 5bfa70242fb1f579e33cd02d0a4088387176ba7c (patch) | |
tree | 71c86814c79b7885ea40beb22e7d63097394a770 /Zend/zend_operators.c | |
parent | b1617d8ac3bad1ace92085194e24cff8cbdbaf31 (diff) | |
download | php-git-BEFORE_NEW_OPERATOR_FIX.tar.gz |
This commit was manufactured by cvs2svn to create tagBEFORE_NEW_OPERATOR_FIX
'BEFORE_NEW_OPERATOR_FIX'.
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r-- | Zend/zend_operators.c | 7 |
1 files changed, 1 insertions, 6 deletions
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; } |