archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removed dead code

Browse source
This commit is contained in:
Julien Pauli 2015-08-17 17:18:25 +02:00
parent 5f54027d04
commit aae9004ebd
5 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/iconv/iconv.c
View file

@ -401,7 +401,6 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c
{ {
char *s, *content_type, *mimetype = NULL; char *s, *content_type, *mimetype = NULL;
int output_status, mimetype_len = 0; int output_status, mimetype_len = 0;
PHP_OUTPUT_TSRMLS(output_context);
if (output_context->op & PHP_OUTPUT_HANDLER_START) { if (output_context->op & PHP_OUTPUT_HANDLER_START) {
output_status = php_output_get_status(); output_status = php_output_get_status();

1
ext/tidy/tidy.c
View file

@ -1149,7 +1149,6 @@ static int php_tidy_output_handler(void **nothing, php_output_context *output_co
int status = FAILURE; int status = FAILURE;
TidyDoc doc; TidyDoc doc;
TidyBuffer inbuf, outbuf, errbuf; 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)) { if (TG(clean_output) && (output_context->op & PHP_OUTPUT_HANDLER_START) && (output_context->op & PHP_OUTPUT_HANDLER_FINAL)) {
doc = tidyCreate(); doc = tidyCreate();

2
ext/zlib/zlib.c
View file

@ -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) static int php_zlib_output_handler_ex(php_zlib_context *ctx, php_output_context *output_context)
{ {
int flags = Z_SYNC_FLUSH; int flags = Z_SYNC_FLUSH;
PHP_OUTPUT_TSRMLS(output_context);
if (output_context->op & PHP_OUTPUT_HANDLER_START) { if (output_context->op & PHP_OUTPUT_HANDLER_START) {
/* start up */ /* 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) static int php_zlib_output_handler(void **handler_context, php_output_context *output_context)
{ {
php_zlib_context *ctx = *(php_zlib_context **) handler_context; php_zlib_context *ctx = *(php_zlib_context **) handler_context;
PHP_OUTPUT_TSRMLS(output_context);
if (!php_zlib_output_encoding()) { if (!php_zlib_output_encoding()) {
/* "Vary: Accept-Encoding" header sent along uncompressed content breaks caching in MSIE, /* "Vary: Accept-Encoding" header sent along uncompressed content breaks caching in MSIE,

2
main/output.c
View file

@ -909,7 +909,6 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
{ {
php_output_handler_status_t status; php_output_handler_status_t status;
int original_op = context->op; int original_op = context->op;
PHP_OUTPUT_TSRMLS(context);
#if PHP_OUTPUT_DEBUG #if PHP_OUTPUT_DEBUG
fprintf(stderr, ">>> op(%d, " 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) 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_handler_func_t func = *(php_output_handler_func_t *) handler_context;
PHP_OUTPUT_TSRMLS(output_context);
if (func) { if (func) {
char *out_str = NULL; char *out_str = NULL;

3
main/php_output.h
View file

@ -104,9 +104,6 @@ typedef struct _php_output_context {
php_output_buffer out; php_output_buffer out;
} php_output_context; } php_output_context;
/* XXX remove this after TLS branch merge */
#define PHP_OUTPUT_TSRMLS(ctx)
/* old-style, stateless callback */ /* 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); 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 */ /* new-style, opaque context callback */