diff options
| author | twosee <twose@qq.com> | 2019-06-12 18:49:33 +0800 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 16:17:16 +0200 |
| commit | 63171d88f2b1f45840d0c63072cde0735b6f2764 (patch) | |
| tree | 369adb0af4391e39fd05ed8d8e0649cc051ca8c3 /Zend/zend_API.h | |
| parent | cf527e93b108eb3a7189bbdb0a64346100b864ec (diff) | |
| download | php-git-63171d88f2b1f45840d0c63072cde0735b6f2764.tar.gz | |
Add do...while(0) for RETURN_* and ZVAL_* APIs
Closes GH-4255.
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index d88fa5a856..fcc7313084 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -627,24 +627,24 @@ END_EXTERN_C() #define RETVAL_FALSE ZVAL_FALSE(return_value) #define RETVAL_TRUE ZVAL_TRUE(return_value) -#define RETURN_BOOL(b) { RETVAL_BOOL(b); return; } -#define RETURN_NULL() { RETVAL_NULL(); return;} -#define RETURN_LONG(l) { RETVAL_LONG(l); return; } -#define RETURN_DOUBLE(d) { RETVAL_DOUBLE(d); return; } -#define RETURN_STR(s) { RETVAL_STR(s); return; } -#define RETURN_INTERNED_STR(s) { RETVAL_INTERNED_STR(s); return; } -#define RETURN_NEW_STR(s) { RETVAL_NEW_STR(s); return; } -#define RETURN_STR_COPY(s) { RETVAL_STR_COPY(s); return; } -#define RETURN_STRING(s) { RETVAL_STRING(s); return; } -#define RETURN_STRINGL(s, l) { RETVAL_STRINGL(s, l); return; } -#define RETURN_EMPTY_STRING() { RETVAL_EMPTY_STRING(); return; } -#define RETURN_RES(r) { RETVAL_RES(r); return; } -#define RETURN_ARR(r) { RETVAL_ARR(r); return; } -#define RETURN_EMPTY_ARRAY() { RETVAL_EMPTY_ARRAY(); return; } -#define RETURN_OBJ(r) { RETVAL_OBJ(r); return; } -#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; } -#define RETURN_FALSE { RETVAL_FALSE; return; } -#define RETURN_TRUE { RETVAL_TRUE; return; } +#define RETURN_BOOL(b) do { RETVAL_BOOL(b); return; } while (0) +#define RETURN_NULL() do { RETVAL_NULL(); return;} while (0) +#define RETURN_LONG(l) do { RETVAL_LONG(l); return; } while (0) +#define RETURN_DOUBLE(d) do { RETVAL_DOUBLE(d); return; } while (0) +#define RETURN_STR(s) do { RETVAL_STR(s); return; } while (0) +#define RETURN_INTERNED_STR(s) do { RETVAL_INTERNED_STR(s); return; } while (0) +#define RETURN_NEW_STR(s) do { RETVAL_NEW_STR(s); return; } while (0) +#define RETURN_STR_COPY(s) do { RETVAL_STR_COPY(s); return; } while (0) +#define RETURN_STRING(s) do { RETVAL_STRING(s); return; } while (0) +#define RETURN_STRINGL(s, l) do { RETVAL_STRINGL(s, l); return; } while (0) +#define RETURN_EMPTY_STRING() do { RETVAL_EMPTY_STRING(); return; } while (0) +#define RETURN_RES(r) do { RETVAL_RES(r); return; } while (0) +#define RETURN_ARR(r) do { RETVAL_ARR(r); return; } while (0) +#define RETURN_EMPTY_ARRAY() do { RETVAL_EMPTY_ARRAY(); return; } while (0) +#define RETURN_OBJ(r) do { RETVAL_OBJ(r); return; } while (0) +#define RETURN_ZVAL(zv, copy, dtor) do { RETVAL_ZVAL(zv, copy, dtor); return; } while (0) +#define RETURN_FALSE do { RETVAL_FALSE; return; } while (0) +#define RETURN_TRUE do { RETVAL_TRUE; return; } while (0) #define HASH_OF(p) (Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties(Z_OBJ_P(p)) : NULL))) #define ZVAL_IS_NULL(z) (Z_TYPE_P(z) == IS_NULL) |