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

cleanup direct tsrm_ls passing

Browse source
This commit is contained in:
Anatol Belski 2014-09-26 12:10:26 +02:00
parent 14eefc82b5
commit aa627174ec
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sapi/cli/php_cli_server.c
View file

@ -2350,9 +2350,6 @@ static int php_cli_server_send_event(php_cli_server *server, php_cli_server_clie
/* }}} */ /* }}} */
typedef struct php_cli_server_do_event_for_each_fd_callback_params { typedef struct php_cli_server_do_event_for_each_fd_callback_params {
#ifdef ZTS
void ***tsrm_ls;
#endif
php_cli_server *server; php_cli_server *server;
int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC); int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC);
int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC); int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC);
@ -2361,9 +2358,7 @@ typedef struct php_cli_server_do_event_for_each_fd_callback_params {
static int php_cli_server_do_event_for_each_fd_callback(void *_params, php_socket_t fd, int event) /* {{{ */ static int php_cli_server_do_event_for_each_fd_callback(void *_params, php_socket_t fd, int event) /* {{{ */
{ {
php_cli_server_do_event_for_each_fd_callback_params *params = _params; php_cli_server_do_event_for_each_fd_callback_params *params = _params;
#ifdef ZTS
void ***tsrm_ls = params->tsrm_ls;
#endif
php_cli_server *server = params->server; php_cli_server *server = params->server;
if (server->server_sock == fd) { if (server->server_sock == fd) {
php_cli_server_client *client = NULL; php_cli_server_client *client = NULL;
@ -2415,9 +2410,6 @@ static int php_cli_server_do_event_for_each_fd_callback(void *_params, php_socke
static void php_cli_server_do_event_for_each_fd(php_cli_server *server, int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC), int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC) TSRMLS_DC) /* {{{ */ static void php_cli_server_do_event_for_each_fd(php_cli_server *server, int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC), int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC) TSRMLS_DC) /* {{{ */
{ {
php_cli_server_do_event_for_each_fd_callback_params params = { php_cli_server_do_event_for_each_fd_callback_params params = {
#ifdef ZTS
(void ***) tsrm_get_ls_cache(),
#endif
server, server,
rhandler, rhandler,
whandler whandler