diff options
author | Xinchen Hui <laruence@gmail.com> | 2014-05-03 16:06:27 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2014-05-03 16:08:58 +0800 |
commit | d8651fbe1c4caaaedc42cef1dee0dd3b3f1e447e (patch) | |
tree | 499ace92cf766bf5cd5a1220d54498632416526f /ext/session/mod_user.c | |
parent | 5984f95d8f8d75007fff4963d67ebe65e572efea (diff) | |
download | php-git-d8651fbe1c4caaaedc42cef1dee0dd3b3f1e447e.tar.gz |
Make they are in the same style of Z_ISREF
Diffstat (limited to 'ext/session/mod_user.c')
-rw-r--r-- | ext/session/mod_user.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 2b4e79996f..21f52a1db0 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -53,7 +53,7 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval TSRML if (call_user_function(EG(function_table), NULL, func, retval, argc, argv TSRMLS_CC) == FAILURE) { zval_ptr_dtor(retval); ZVAL_UNDEF(retval); - } else if (ZVAL_IS_UNDEF(retval)) { + } else if (Z_ISUNDEF_P(retval)) { ZVAL_NULL(retval); } for (i = 0; i < argc; i++) { @@ -68,7 +68,7 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval TSRML #define PSF(a) PS(mod_user_names).name.ps_##a #define FINISH \ - if (!ZVAL_IS_UNDEF(&retval)) { \ + if (!Z_ISUNDEF(retval)) { \ convert_to_long(&retval); \ ret = Z_LVAL(retval); \ zval_ptr_dtor(&retval); \ @@ -80,7 +80,7 @@ PS_OPEN_FUNC(user) zval args[2]; STDVARS; - if (ZVAL_IS_UNDEF(&PSF(open))) { + if (Z_ISUNDEF(PSF(open))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "user session functions not defined"); @@ -115,7 +115,7 @@ PS_CLOSE_FUNC(user) PS(mod_user_implemented) = 0; if (bailout) { - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } zend_bailout(); @@ -133,7 +133,7 @@ PS_READ_FUNC(user) ps_call_handler(&PSF(read), 1, args, &retval TSRMLS_CC); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { if (Z_TYPE(retval) == IS_STRING) { *val = STR_COPY(Z_STR(retval)); ret = SUCCESS; @@ -184,13 +184,13 @@ PS_GC_FUNC(user) PS_CREATE_SID_FUNC(user) { /* maintain backwards compatibility */ - if (!ZVAL_IS_UNDEF(&PSF(create_sid))) { + if (!Z_ISUNDEF(PSF(create_sid))) { zend_string *id = NULL; zval retval; ps_call_handler(&PSF(create_sid), 0, NULL, &retval TSRMLS_CC); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { if (Z_TYPE(retval) == IS_STRING) { id = STR_COPY(Z_STR(retval)); } |