diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-17 11:50:32 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-17 11:50:32 +0400 |
| commit | 0e425121b3cb9ab7cbffee83ee62d833de42e9dd (patch) | |
| tree | 3121a683c647ef28f5209c79f85463a8b6fd265e /Zend/zend_constants.c | |
| parent | ab2a73a6629850bfd131996a54ca649cfd455f01 (diff) | |
| download | php-git-0e425121b3cb9ab7cbffee83ee62d833de42e9dd.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index a68f3f09a9..f6cbac3968 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -274,13 +274,12 @@ static zend_constant *zend_get_special_constant(const char *name, uint name_len ZEND_API int zend_get_constant(const char *name, uint name_len, zval *result TSRMLS_DC) { zend_constant *c; - int retval = 1; if ((c = zend_hash_str_find_ptr(EG(zend_constants), name, name_len)) == NULL) { char *lcname = zend_str_tolower_dup(name, name_len); if ((c = zend_hash_str_find_ptr(EG(zend_constants), lcname, name_len)) != NULL) { if (c->flags & CONST_CS) { - retval=0; + c = NULL; } } else { c = zend_get_special_constant(name, name_len TSRMLS_CC); @@ -288,11 +287,12 @@ ZEND_API int zend_get_constant(const char *name, uint name_len, zval *result TSR efree(lcname); } - if (retval) { + if (c) { ZVAL_DUP(result, &c->value); + return 1; } - return retval; + return 0; } ZEND_API int zend_get_constant_ex(const char *name, uint name_len, zval *result, zend_class_entry *scope, ulong flags TSRMLS_DC) |