From 4bd22cf1c1d6a262fe2f026e082f2565433c53df Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 29 Jun 2015 16:44:54 +0300 Subject: Improved zend_string API (Francois Laupretre) Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre 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 Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods --- ext/tidy/tidy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/tidy/tidy.c') 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; -- cgit v1.2.1