com php-src: Removed dead code: ext/iconv/iconv.c ext/tidy/tidy.c ext/zlib/zlib.c main/output.c main/php_output.h

Commit: aae9004ebdf42fbebafa461902009a936285415c Author: Julien Pauli <jpauli@php.net> Mon, 17 Aug 2015 17:18:25 +0200 Parents: 5f54027d045fe00c5dc662310d48933b56c2f9ae Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aae9004ebdf42fbebafa461902009a936285415c Log: Removed dead code Changed paths: M ext/iconv/iconv.c M ext/tidy/tidy.c M ext/zlib/zlib.c M main/output.c M main/php_output.h Diff: diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 8699174..59d3985 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -401,7 +401,6 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c { char *s, *content_type, *mimetype = NULL; int output_status, mimetype_len = 0; - PHP_OUTPUT_TSRMLS(output_context); if (output_context->op & PHP_OUTPUT_HANDLER_START) { output_status = php_output_get_status(); diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index f570da6..cdda540 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy..c @@ -1149,7 +1149,6 @@ static int php_tidy_output_handler(void **nothing, php_output_context *output_co int status = FAILURE; TidyDoc doc; TidyBuffer inbuf, outbuf, errbuf; - PHP_OUTPUT_TSRMLS(output_context); if (TG(clean_output) && (output_context->op & PHP_OUTPUT_HANDLER_START) && (output_context->op & PHP_OUTPUT_HANDLER_FINAL)) { doc = tidyCreate(); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 2d14159..7abd7cf 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -124,7 +124,6 @@ static int php_zlib_output_encoding(void) static int php_zlib_output_handler_ex(php_zlib_context *ctx, php_output_context *output_context) { int flags = Z_SYNC_FLUSH; - PHP_OUTPUT_TSRMLS(output_context); if (output_context->op & PHP_OUTPUT_HANDLER_START) { /* start up */ @@ -210,7 +209,6 @@ static int php_zlib_output_handler_ex(php_zlib_context *ctx, php_output_context static int php_zlib_output_handler(void **handler_context, php_output_context *output_context) { php_zlib_context *ctx = *(php_zlib_context **) handler_context; - PHP_OUTPUT_TSRMLS(output_context); if (!php_zlib_output_encoding()) { /* "Vary: Accept-Encoding" header sent along uncompressed content breaks caching in MSIE, diff --git a/main/output.c b/main/output.c index 5c56fe9..831c11f 100644 --- a/main/output.c +++ b/main/output.c @@ -909,7 +909,6 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl { php_output_handler_status_t status; int original_op = context->op; - PHP_OUTPUT_TSRMLS(context); #if PHP_OUTPUT_DEBUG fprintf(stderr, ">>> op(%d, " @@ -1249,7 +1248,6 @@ static inline int php_output_stack_pop(int flags) static int php_output_handler_compat_func(void **handler_context, php_output_context *output_context) { php_output_handler_func_t func = *(php_output_handler_func_t *) handler_context; - PHP_OUTPUT_TSRMLS(output_context); if (func) { char *out_str = NULL; diff --git a/main/php_output.h b/main/php_output.h index 4950c8d...6bb89a7 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -104,9 +104,6 @@ typedef struct _php_output_context { php_output_buffer out; } php_output_context; -/* XXX remove this after TLS branch merge */ -#define PHP_OUTPUT_TSRMLS(ctx) - /* old-style, stateless callback */ typedef void (*php_output_handler_func_t)(char *output, size_t output_len, char **handled_output, size_t *handled_output_len, int mode); /* new-style, opaque context callback */