summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/internal_functions.c.in4
-rw-r--r--main/network.c18
-rw-r--r--main/php_network.h12
-rw-r--r--main/php_streams.h2
-rw-r--r--main/streams/php_stream_filter_api.h2
-rw-r--r--main/streams/php_stream_transport.h10
-rw-r--r--main/streams/streams.c2
-rw-r--r--main/streams/transports.c10
-rw-r--r--main/streams/userspace.c16
-rw-r--r--main/streams/xp_socket.c16
10 files changed, 46 insertions, 46 deletions
diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 3f02921ddf..d04eea3103 100644
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -35,9 +35,9 @@ static zend_module_entry *php_builtin_extensions[] = {
#define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
-PHPAPI int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(void)
{
- return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC);
+ return php_register_extensions(php_builtin_extensions, EXTCOUNT);
}
/*
diff --git a/main/network.c b/main/network.c
index 233122a0d3..ac80f53f93 100644
--- a/main/network.c
+++ b/main/network.c
@@ -417,7 +417,7 @@ static inline void sub_times(struct timeval a, struct timeval b, struct timeval
/* {{{ php_network_bind_socket_to_local_addr */
php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned port,
int socktype, long sockopts, zend_string **error_string, int *error_code
- TSRMLS_DC)
+ )
{
int num_addrs, n, err = 0;
php_socket_t sock;
@@ -602,7 +602,7 @@ PHPAPI void php_network_populate_name_from_sockaddr(
/* output address */
struct sockaddr **addr,
socklen_t *addrlen
- TSRMLS_DC)
+ )
{
if (addr) {
*addr = emalloc(sl);
@@ -663,7 +663,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock,
zend_string **textaddr,
struct sockaddr **addr,
socklen_t *addrlen
- TSRMLS_DC)
+ )
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
@@ -673,7 +673,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock,
php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,
textaddr,
addr, addrlen
- TSRMLS_CC);
+ );
return 0;
}
return -1;
@@ -683,7 +683,7 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock,
zend_string **textaddr,
struct sockaddr **addr,
socklen_t *addrlen
- TSRMLS_DC)
+ )
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
@@ -693,7 +693,7 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock,
php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,
textaddr,
addr, addrlen
- TSRMLS_CC);
+ );
return 0;
}
return -1;
@@ -717,7 +717,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
struct timeval *timeout,
zend_string **error_string,
int *error_code
- TSRMLS_DC)
+ )
{
php_socket_t clisock = -1;
int error = 0, n;
@@ -739,7 +739,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,
textaddr,
addr, addrlen
- TSRMLS_CC);
+ );
} else {
error = php_socket_errno();
}
@@ -768,7 +768,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short port,
int socktype, int asynchronous, struct timeval *timeout, zend_string **error_string,
int *error_code, char *bindto, unsigned short bindport, long sockopts
- TSRMLS_DC)
+ )
{
int num_addrs, n, fatal = 0;
php_socket_t sock;
diff --git a/main/php_network.h b/main/php_network.h
index 7529eb71e0..5a168cb0f9 100644
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -236,7 +236,7 @@ PHPAPI void php_network_freeaddresses(struct sockaddr **sal);
PHPAPI php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short port,
int socktype, int asynchronous, struct timeval *timeout, zend_string **error_string,
int *error_code, char *bindto, unsigned short bindport, long sockopts
- TSRMLS_DC);
+ );
PHPAPI int php_network_connect_socket(php_socket_t sockfd,
const struct sockaddr *addr,
@@ -251,7 +251,7 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd,
PHPAPI php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned port,
int socktype, long sockopts, zend_string **error_string, int *error_code
- TSRMLS_DC);
+ );
PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
zend_string **textaddr,
@@ -260,19 +260,19 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
struct timeval *timeout,
zend_string **error_string,
int *error_code
- TSRMLS_DC);
+ );
PHPAPI int php_network_get_sock_name(php_socket_t sock,
zend_string **textaddr,
struct sockaddr **addr,
socklen_t *addrlen
- TSRMLS_DC);
+ );
PHPAPI int php_network_get_peer_name(php_socket_t sock,
zend_string **textaddr,
struct sockaddr **addr,
socklen_t *addrlen
- TSRMLS_DC);
+ );
PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port);
PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr);
@@ -303,7 +303,7 @@ PHPAPI void php_network_populate_name_from_sockaddr(
/* output address */
struct sockaddr **addr,
socklen_t *addrlen
- TSRMLS_DC);
+ );
PHPAPI int php_network_parse_network_address_with_port(const char *addr,
zend_long addrlen, struct sockaddr *sa, socklen_t *sl);
diff --git a/main/php_streams.h b/main/php_streams.h
index fe51f5e184..c0f16b6126 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -301,7 +301,7 @@ PHPAPI size_t _php_stream_printf(php_stream *stream, const char *fmt, ...) PHP_A
PHPAPI size_t _php_stream_printf(php_stream *stream, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
#endif
-/* php_stream_printf macro & function require TSRMLS_CC */
+/* php_stream_printf macro & function require */
#define php_stream_printf _php_stream_printf
PHPAPI int _php_stream_eof(php_stream *stream);
diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h
index feeb96aba0..7c9248ecc1 100644
--- a/main/streams/php_stream_filter_api.h
+++ b/main/streams/php_stream_filter_api.h
@@ -90,7 +90,7 @@ typedef struct _php_stream_filter_ops {
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC);
+ );
void (*dtor)(php_stream_filter *thisfilter);
diff --git a/main/streams/php_stream_transport.h b/main/streams/php_stream_transport.h
index 89a2e9a5f3..7f587282f0 100644
--- a/main/streams/php_stream_transport.h
+++ b/main/streams/php_stream_transport.h
@@ -61,7 +61,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, size_t namelen, in
PHPAPI int php_stream_xport_bind(php_stream *stream,
const char *name, size_t namelen,
zend_string **error_text
- TSRMLS_DC);
+ );
/* Connect to a remote address */
PHPAPI int php_stream_xport_connect(php_stream *stream,
@@ -70,13 +70,13 @@ PHPAPI int php_stream_xport_connect(php_stream *stream,
struct timeval *timeout,
zend_string **error_text,
int *error_code
- TSRMLS_DC);
+ );
/* Prepare to listen */
PHPAPI int php_stream_xport_listen(php_stream *stream,
int backlog,
zend_string **error_text
- TSRMLS_DC);
+ );
/* Get the next client and their address as a string, or the underlying address
* structure. You must efree either of these if you request them */
@@ -85,13 +85,13 @@ PHPAPI int php_stream_xport_accept(php_stream *stream, php_stream **client,
void **addr, socklen_t *addrlen,
struct timeval *timeout,
zend_string **error_text
- TSRMLS_DC);
+ );
/* Get the name of either the socket or it's peer */
PHPAPI int php_stream_xport_get_name(php_stream *stream, int want_peer,
zend_string **textaddr,
void **addr, socklen_t *addrlen
- TSRMLS_DC);
+ );
enum php_stream_xport_send_recv_flags {
STREAM_OOB = 1,
diff --git a/main/streams/streams.c b/main/streams/streams.c
index b5340e693a..fab5d42eb3 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -695,7 +695,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size)
justread = stream->ops->read(stream, (char*)stream->readbuf + stream->writepos,
stream->readbuflen - stream->writepos
- TSRMLS_CC);
+ );
if (justread != (size_t)-1) {
stream->writepos += justread;
diff --git a/main/streams/transports.c b/main/streams/transports.c
index c0657ed0b4..6c68f839be 100644
--- a/main/streams/transports.c
+++ b/main/streams/transports.c
@@ -196,7 +196,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, size_t namelen, in
PHPAPI int php_stream_xport_bind(php_stream *stream,
const char *name, size_t namelen,
zend_string **error_text
- TSRMLS_DC)
+ )
{
php_stream_xport_param param;
int ret;
@@ -227,7 +227,7 @@ PHPAPI int php_stream_xport_connect(php_stream *stream,
struct timeval *timeout,
zend_string **error_text,
int *error_code
- TSRMLS_DC)
+ )
{
php_stream_xport_param param;
int ret;
@@ -286,7 +286,7 @@ PHPAPI int php_stream_xport_accept(php_stream *stream, php_stream **client,
void **addr, socklen_t *addrlen,
struct timeval *timeout,
zend_string **error_text
- TSRMLS_DC)
+ )
{
php_stream_xport_param param;
int ret;
@@ -322,7 +322,7 @@ PHPAPI int php_stream_xport_accept(php_stream *stream, php_stream **client,
PHPAPI int php_stream_xport_get_name(php_stream *stream, int want_peer,
zend_string **textaddr,
void **addr, socklen_t *addrlen
- TSRMLS_DC)
+ )
{
php_stream_xport_param param;
int ret;
@@ -394,7 +394,7 @@ PHPAPI int php_stream_xport_crypto_enable(php_stream *stream, int activate)
* peeking, optionally retrieving OOB data */
PHPAPI int php_stream_xport_recvfrom(php_stream *stream, char *buf, size_t buflen,
int flags, void **addr, socklen_t *addrlen, zend_string **textaddr
- TSRMLS_DC)
+ )
{
php_stream_xport_param param;
int ret = 0;
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 1215851374..c3f167636e 100644
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -377,7 +377,7 @@ static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, const char *
&zfuncname,
&zretval,
4, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && Z_TYPE(zretval) != IS_UNDEF && zval_is_true(&zretval)) {
/* the stream is now open! */
@@ -452,7 +452,7 @@ static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, const char
&zfuncname,
&zretval,
2, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && Z_TYPE(zretval) != IS_UNDEF && zval_is_true(&zretval)) {
/* the stream is now open! */
@@ -1107,7 +1107,7 @@ static int user_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
&zfuncname,
&zretval,
1, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) {
ret = (Z_TYPE(zretval) == IS_TRUE);
@@ -1152,7 +1152,7 @@ static int user_wrapper_rename(php_stream_wrapper *wrapper, const char *url_from
&zfuncname,
&zretval,
2, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) {
ret = (Z_TYPE(zretval) == IS_TRUE);
@@ -1199,7 +1199,7 @@ static int user_wrapper_mkdir(php_stream_wrapper *wrapper, const char *url, int
&zfuncname,
&zretval,
3, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) {
ret = (Z_TYPE(zretval) == IS_TRUE);
@@ -1246,7 +1246,7 @@ static int user_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url,
&zfuncname,
&zretval,
2, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) {
ret = (Z_TYPE(zretval) == IS_TRUE);
@@ -1317,7 +1317,7 @@ static int user_wrapper_metadata(php_stream_wrapper *wrapper, const char *url, i
&zfuncname,
&zretval,
3, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) {
ret = Z_TYPE(zretval) == IS_TRUE;
@@ -1365,7 +1365,7 @@ static int user_wrapper_stat_url(php_stream_wrapper *wrapper, const char *url, i
&zfuncname,
&zretval,
2, args,
- 0, NULL TSRMLS_CC);
+ 0, NULL );
if (call_result == SUCCESS && Z_TYPE(zretval) == IS_ARRAY) {
/* We got the info we needed */
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;
View Lorry Controller Status