diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-30 18:32:42 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-30 18:32:42 +0400 |
| commit | 17d027ed47c1f07b397a611431d28ad0e0107146 (patch) | |
| tree | da6cadcd3ca0cad02dd4ff39f027575070873cbd /Zend/zend.c | |
| parent | 6a911e833f6b6dcac669a60808e96dc2c4f391d3 (diff) | |
| download | php-git-17d027ed47c1f07b397a611431d28ad0e0107146.tar.gz | |
Split IS_BOOL into IS_FALSE and IS_TRUE
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 465446d663..f4bab5032c 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -220,19 +220,15 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop again: switch (Z_TYPE_P(expr)) { - case IS_NULL: { + case IS_NULL: + case IS_FALSE: { TSRMLS_FETCH(); ZVAL_EMPTY_STRING(expr_copy); break; } - case IS_BOOL: - if (Z_LVAL_P(expr)) { - // TODO: use interned string ??? - ZVAL_NEW_STR(expr_copy, STR_INIT("1", 1, 0)); - } else { - TSRMLS_FETCH(); - ZVAL_EMPTY_STRING(expr_copy); - } + case IS_TRUE: + // TODO: use interned string ??? + ZVAL_NEW_STR(expr_copy, STR_INIT("1", 1, 0)); break; case IS_RESOURCE: { char buf[sizeof("Resource id #") + MAX_LENGTH_OF_LONG]; @@ -1201,7 +1197,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ ZVAL_UNDEF(&retval); if (call_user_function_ex(CG(function_table), NULL, &orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC) == SUCCESS) { if (Z_TYPE(retval) != IS_UNDEF) { - if (Z_TYPE(retval) == IS_BOOL && Z_LVAL(retval) == 0) { + if (Z_TYPE(retval) == IS_FALSE) { zend_error_cb(type, error_filename, error_lineno, format, args); } zval_ptr_dtor(&retval); |