diff options
| author | Zeev Suraski <zeev@php.net> | 1999-07-23 16:02:51 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-07-23 16:02:51 +0000 |
| commit | 84aa8cce64c1c074a059fc74eb546cb028c32b5e (patch) | |
| tree | 32ddbad2f32e801f56c4c2247a7b905833338606 /Zend/zend_operators.c | |
| parent | 33f30aee64d01e7b3f59ef087b2b250a7eb3a1e5 (diff) | |
| download | php-git-84aa8cce64c1c074a059fc74eb546cb028c32b5e.tar.gz | |
* Add an API macro users can use to ensure an array member can be modifed
before they modify it.
* Fix a bug and remove redundant code in convert_to_long() (booleans and
resources weren't changing their types
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; } |