clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove SMART_STR_USE_REALLOC

Browse Source
This commit is contained in:
Nikita Popov 2014-09-19 21:34:05 +02:00
parent c7446bbd39
commit 070667de8d
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/standard/php_smart_str.h
View File

@ -24,9 +24,7 @@
#include "php_smart_str_public.h"
#include <stdlib.h>
#ifndef SMART_STR_USE_REALLOC
#include <zend.h>
#endif
#define smart_str_0(x) do { \
if ((x)->s) { \
@ -42,20 +40,6 @@
#define SMART_STR_START_SIZE 78
#endif
#ifdef SMART_STR_USE_REALLOC
#define SMART_STR_DO_REALLOC(b, w) do { \
int oldlen = (b)->s->len; \
(b)->s = erealloc((buf)->s, _STR_HEADER_SIZE + (b)->a + 1); \
(b)->s->len = oldlen; \
} while (0)
#else
#define SMART_STR_DO_REALLOC(b, w) do { \
(b)->s = perealloc((b)->s, _STR_HEADER_SIZE + (b)->a + 1, (w)); \
} while (0)
#endif
#define smart_str_alloc4(d, n, what, newlen) do { \
if (!(d)->s) { \
newlen = (n); \
@ -68,7 +52,7 @@
newlen = (d)->s->len + (n); \
if (newlen >= (d)->a) { \
(d)->a = newlen + SMART_STR_PREALLOC; \
SMART_STR_DO_REALLOC((d), (what)); \
(d)->s = perealloc((d)->s, _STR_HEADER_SIZE + (d)->a + 1, (what)); \
} \
} \
} while (0)