diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-29 16:44:54 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-29 16:44:54 +0300 |
| commit | 4bd22cf1c1d6a262fe2f026e082f2565433c53df (patch) | |
| tree | 09a65791a35333a58320a3d872f12496d3a6aecd /Zend/zend_smart_str.c | |
| parent | 667e9bd4177e40a52b4f0cd6bfed5737c2694a47 (diff) | |
| download | php-git-4bd22cf1c1d6a262fe2f026e082f2565433c53df.tar.gz | |
Improved zend_string API (Francois Laupretre)
Squashed commit of the following:
commit d96eab8d79b75ac83d49d49ae4665f948d15a804
Author: Francois Laupretre <francois@tekwire.net>
Date: Fri Jun 26 01:23:31 2015 +0200
Use the new 'ZSTR' macros in the rest of the code.
Does not change anything to the generated code (thanks to compat macros) but cleaner.
commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8
Author: Francois Laupretre <francois@tekwire.net>
Date: Thu Jun 25 13:45:06 2015 +0200
Improve zend_string API
Add missing methods
Diffstat (limited to 'Zend/zend_smart_str.c')
| -rw-r--r-- | Zend/zend_smart_str.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_smart_str.c b/Zend/zend_smart_str.c index d0d3689cd0..44b74a7489 100644 --- a/Zend/zend_smart_str.c +++ b/Zend/zend_smart_str.c @@ -19,7 +19,7 @@ #include <zend.h> #include "zend_smart_str_public.h" -#define SMART_STR_OVERHEAD (ZEND_MM_OVERHEAD + _STR_HEADER_SIZE) +#define SMART_STR_OVERHEAD (ZEND_MM_OVERHEAD + _ZSTR_HEADER_SIZE) #ifndef SMART_STR_PAGE # define SMART_STR_PAGE 4096 @@ -42,7 +42,7 @@ ZEND_API void ZEND_FASTCALL smart_str_erealloc(smart_str *str, size_t len) str->s->len = 0; } else { str->a = SMART_STR_NEW_SIZE(len); - str->s = (zend_string *) erealloc2(str->s, _STR_HEADER_SIZE + str->a + 1, _STR_HEADER_SIZE + str->s->len + 1); + str->s = (zend_string *) erealloc2(str->s, _ZSTR_HEADER_SIZE + str->a + 1, _ZSTR_HEADER_SIZE + str->s->len + 1); } } @@ -56,6 +56,6 @@ ZEND_API void ZEND_FASTCALL smart_str_realloc(smart_str *str, size_t len) str->s->len = 0; } else { str->a = SMART_STR_NEW_SIZE(len); - str->s = (zend_string *) realloc(str->s, _STR_HEADER_SIZE + str->a + 1); + str->s = (zend_string *) realloc(str->s, _ZSTR_HEADER_SIZE + str->a + 1); } } |