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 /ext/tidy | |
| 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 'ext/tidy')
| -rw-r--r-- | ext/tidy/tidy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 5df732ff53..e1c13e6515 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -646,7 +646,7 @@ static zend_string *php_tidy_file_to_mem(char *filename, zend_bool use_include_p return NULL; } if ((data = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0)) == NULL) { - data = STR_EMPTY_ALLOC(); + data = ZSTR_EMPTY_ALLOC(); } php_stream_close(stream); @@ -928,7 +928,7 @@ static void *php_tidy_get_opt_val(PHPTidyDoc *ptdoc, TidyOption opt, TidyOptionT if (val) { return (void *) zend_string_init(val, strlen(val), 0); } else { - return (void *) STR_EMPTY_ALLOC(); + return (void *) ZSTR_EMPTY_ALLOC(); } } break; |