diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
| commit | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (patch) | |
| tree | f5ded37abc65e64e270b6f1ac264db9bc603f949 /Zend/zend_constants.c | |
| parent | cf7e703813e065fec7a8a5caa7aff4b70d3455b8 (diff) | |
| parent | 54d9ad53f4797733b41bf2c65bd2c2cb5a1938b6 (diff) | |
| download | php-git-e48b9ad197b4ec6ac72e75538453cc350d0a41f4.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index d917fed502..f3c58065ee 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -440,28 +440,28 @@ finish: return zend_get_constant(name, name_len, result TSRMLS_CC); } -zend_constant *zend_quick_get_constant(const zend_literal *key, ulong flags TSRMLS_DC) +zend_constant *zend_quick_get_constant(const zval *key, ulong flags TSRMLS_DC) { zend_constant *c; - if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR(key->constant))) == NULL) { + if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR_P(key))) == NULL) { key++; - if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR(key->constant))) == NULL || + if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR_P(key))) == NULL || (c->flags & CONST_CS) != 0) { if ((flags & (IS_CONSTANT_IN_NAMESPACE|IS_CONSTANT_UNQUALIFIED)) == (IS_CONSTANT_IN_NAMESPACE|IS_CONSTANT_UNQUALIFIED)) { key++; - if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR(key->constant))) == NULL) { + if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR_P(key))) == NULL) { key++; - if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR(key->constant))) == NULL || + if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR_P(key))) == NULL || (c->flags & CONST_CS) != 0) { key--; - c = zend_get_special_constant(Z_STRVAL(key->constant), Z_STRLEN(key->constant) TSRMLS_CC); + c = zend_get_special_constant(Z_STRVAL_P(key), Z_STRLEN_P(key) TSRMLS_CC); } } } else { key--; - c = zend_get_special_constant(Z_STRVAL(key->constant), Z_STRLEN(key->constant) TSRMLS_CC); + c = zend_get_special_constant(Z_STRVAL_P(key), Z_STRLEN_P(key) TSRMLS_CC); } } } |