diff options
| author | Anatol Belski <ab@php.net> | 2014-12-14 14:07:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-14 14:07:59 +0100 |
| commit | e112f6a04e0cddc6276c426c09c0249201878f5a (patch) | |
| tree | 03b914303e60fce6ee830eac907cf323f7702722 /main/streams/xp_socket.c | |
| parent | bdeb220f48825642f84cdbf3ff23a30613c92e86 (diff) | |
| download | php-git-e112f6a04e0cddc6276c426c09c0249201878f5a.tar.gz | |
second shot on removing TSRMLS_*
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 983f403c9d..9fa2ae367e 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -244,7 +244,7 @@ static int php_sockop_stat(php_stream *stream, php_stream_statbuf *ssb) static inline int sock_sendto(php_netstream_data_t *sock, const char *buf, size_t buflen, int flags, struct sockaddr *addr, socklen_t addrlen - TSRMLS_DC) + ) { int ret; if (addr) { @@ -262,7 +262,7 @@ static inline int sock_sendto(php_netstream_data_t *sock, const char *buf, size_ static inline int sock_recvfrom(php_netstream_data_t *sock, char *buf, size_t buflen, int flags, zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC) + ) { php_sockaddr_storage sa; socklen_t sl = sizeof(sa); @@ -353,7 +353,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void xparam->want_textaddr ? &xparam->outputs.textaddr : NULL, xparam->want_addr ? &xparam->outputs.addr : NULL, xparam->want_addr ? &xparam->outputs.addrlen : NULL - TSRMLS_CC); + ); return PHP_STREAM_OPTION_RETURN_OK; case STREAM_XPORT_OP_GET_PEER_NAME: @@ -361,7 +361,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void xparam->want_textaddr ? &xparam->outputs.textaddr : NULL, xparam->want_addr ? &xparam->outputs.addr : NULL, xparam->want_addr ? &xparam->outputs.addrlen : NULL - TSRMLS_CC); + ); return PHP_STREAM_OPTION_RETURN_OK; case STREAM_XPORT_OP_SEND: @@ -396,7 +396,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void xparam->want_textaddr ? &xparam->outputs.textaddr : NULL, xparam->want_addr ? &xparam->outputs.addr : NULL, xparam->want_addr ? &xparam->outputs.addrlen : NULL - TSRMLS_CC); + ); return PHP_STREAM_OPTION_RETURN_OK; @@ -647,7 +647,7 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t * sockopts, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err - TSRMLS_CC); + ); if (host) { efree(host); @@ -733,7 +733,7 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_ bindto, bindport, sockopts - TSRMLS_CC); + ); ret = sock->socket == -1 ? -1 : 0; xparam->outputs.error_code = err; @@ -771,7 +771,7 @@ static inline int php_tcp_sockop_accept(php_stream *stream, php_netstream_data_t xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &xparam->outputs.error_code - TSRMLS_CC); + ); if (clisock >= 0) { php_netstream_data_t *clisockdata; |