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_API.h | |
| parent | ab2a73a6629850bfd131996a54ca649cfd455f01 (diff) | |
| download | php-git-0e425121b3cb9ab7cbffee83ee62d833de42e9dd.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 61d2276f13..2ff7e69437 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -545,10 +545,10 @@ END_EXTERN_C() #define CHECK_NULL_PATH(p, l) (strlen(p) != l) #define ZVAL_STRINGL(z, s, l) do { \ - zval *__z = (z); \ + zval *_z = (z); \ int __l = l; \ - ZVAL_STR(__z, STR_ALLOC(__l, 0)); \ - memcpy(Z_STRVAL_P(__z), (s), __l + 1); \ + ZVAL_STR(_z, STR_ALLOC(__l, 0)); \ + memcpy(Z_STRVAL_P(_z), (s), __l + 1); \ } while (0) #define ZVAL_STRING(z, s) do { \ @@ -562,10 +562,10 @@ END_EXTERN_C() } while (0) #define ZVAL_PSTRINGL(z, s, l) do { \ - zval *__z = (z); \ + zval *_z = (z); \ int __l = l; \ - ZVAL_STR(__z, STR_ALLOC(__l, 1)); \ - memcpy(Z_STRVAL_P(__z), (s), __l + 1); \ + ZVAL_STR(_z, STR_ALLOC(__l, 1)); \ + memcpy(Z_STRVAL_P(_z), (s), __l + 1); \ } while (0) #define ZVAL_PSTRING(z, s) do { \ @@ -575,7 +575,7 @@ END_EXTERN_C() } while (0) #define ZVAL_EMPTY_PSTRING(z) do { \ - ZVAL_PSTRINGL(z, "", 0); \ + ZVAL_PSTRINGL(z, "", 0); \ } while (0) #define ZVAL_ZVAL(z, zv, copy, dtor) do { \ |