1 files changed, 65 insertions, 65 deletions

diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index 3c076b4e7c..b8e7216c9b 100644
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -51,9 +51,9 @@ enum source_op {
 	UNBLOCK_SOURCE
 };
 
-static int _php_mcast_join_leave(php_socket *sock, int level, struct sockaddr *group, socklen_t group_len, unsigned int if_index, int join TSRMLS_DC);
+static int _php_mcast_join_leave(php_socket *sock, int level, struct sockaddr *group, socklen_t group_len, unsigned int if_index, int join);
 #ifdef HAS_MCAST_EXT
-static int _php_mcast_source_op(php_socket *sock, int level, struct sockaddr *group, socklen_t group_len, struct sockaddr *source, socklen_t source_len, unsigned int if_index, enum source_op sop TSRMLS_DC);
+static int _php_mcast_source_op(php_socket *sock, int level, struct sockaddr *group, socklen_t group_len, struct sockaddr *source, socklen_t source_len, unsigned int if_index, enum source_op sop);
 #endif
 
 #ifdef RFC3678_API
@@ -63,14 +63,14 @@ static const char *_php_source_op_to_string(enum source_op sop);
 static int _php_source_op_to_ipv4_op(enum source_op sop);
 #endif
 
-int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC)
+int php_string_to_if_index(const char *val, unsigned *out)
 {
 #if HAVE_IF_NAMETOINDEX
 	unsigned int ind;
 
 	ind = if_nametoindex(val);
 	if (ind == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"no interface with name \"%s\" could be found", val);
 		return FAILURE;
 	} else {
@@ -78,20 +78,20 @@ int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC)
 		return SUCCESS;
 	}
 #else
-	php_error_docref(NULL TSRMLS_CC, E_WARNING,
+	php_error_docref(NULL, E_WARNING,
 			"this platform does not support looking up an interface by "
 			"name, an integer interface index must be supplied instead");
 	return FAILURE;
 #endif
 }
 
-static int php_get_if_index_from_zval(zval *val, unsigned *out TSRMLS_DC)
+static int php_get_if_index_from_zval(zval *val, unsigned *out)
 {
 	int ret;
 
 	if (Z_TYPE_P(val) == IS_LONG) {
 		if (Z_LVAL_P(val) < 0 || Z_LVAL_P(val) > UINT_MAX) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			php_error_docref(NULL, E_WARNING,
 				"the interface index cannot be negative or larger than %u;"
 				" given %pd", UINT_MAX, Z_LVAL_P(val));
 			ret = FAILURE;
@@ -104,7 +104,7 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out TSRMLS_DC)
 			Z_ADDREF_P(val);
 		}
 		convert_to_string_ex(val);
-		ret = php_string_to_if_index(Z_STRVAL_P(val), out TSRMLS_CC);
+		ret = php_string_to_if_index(Z_STRVAL_P(val), out);
 		zval_ptr_dtor(val);
 	}
 
@@ -114,7 +114,7 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out TSRMLS_DC)
 
 
 static int php_get_if_index_from_array(const HashTable *ht, const char *key,
-	php_socket *sock, unsigned int *if_index TSRMLS_DC)
+	php_socket *sock, unsigned int *if_index)
 {
 	zval *val;
 
@@ -123,23 +123,23 @@ static int php_get_if_index_from_array(const HashTable *ht, const char *key,
 		return SUCCESS;
 	}
 
-	return php_get_if_index_from_zval(val, if_index TSRMLS_CC);
+	return php_get_if_index_from_zval(val, if_index);
 }
 
 static int php_get_address_from_array(const HashTable *ht, const char *key,
-	php_socket *sock, php_sockaddr_storage *ss, socklen_t *ss_len TSRMLS_DC)
+	php_socket *sock, php_sockaddr_storage *ss, socklen_t *ss_len)
 {
 	zval *val;
 
 	if ((val = zend_hash_str_find(ht, key, strlen(key))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "no key \"%s\" passed in optval", key);
+		php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", key);
 		return FAILURE;
 	}
 	if (Z_REFCOUNTED_P(val)) {
 		Z_ADDREF_P(val);
 	}
 	convert_to_string_ex(val);
-	if (!php_set_inet46_addr(ss, ss_len, Z_STRVAL_P(val), sock TSRMLS_CC)) {
+	if (!php_set_inet46_addr(ss, ss_len, Z_STRVAL_P(val), sock)) {
 		zval_ptr_dtor(val);
 		return FAILURE;
 	}
@@ -147,16 +147,16 @@ static int php_get_address_from_array(const HashTable *ht, const char *key,
 	return SUCCESS;
 }
 
-static int php_do_mcast_opt(php_socket *php_sock, int level, int optname, zval *arg4 TSRMLS_DC)
+static int php_do_mcast_opt(php_socket *php_sock, int level, int optname, zval *arg4)
 {
 	HashTable		 		*opt_ht;
 	unsigned int			if_index;
 	int						retval;
 	int (*mcast_req_fun)(php_socket *, int, struct sockaddr *, socklen_t,
-		unsigned TSRMLS_DC);
+		unsigned);
 #ifdef HAS_MCAST_EXT
 	int (*mcast_sreq_fun)(php_socket *, int, struct sockaddr *, socklen_t,
-		struct sockaddr *, socklen_t, unsigned TSRMLS_DC);
+		struct sockaddr *, socklen_t, unsigned);
 #endif
 
 	switch (optname) {
@@ -174,16 +174,16 @@ mcast_req_fun:
 			opt_ht = HASH_OF(arg4);
 
 			if (php_get_address_from_array(opt_ht, "group", php_sock, &group,
-				&glen TSRMLS_CC) == FAILURE) {
+				&glen) == FAILURE) {
 					return FAILURE;
 			}
 			if (php_get_if_index_from_array(opt_ht, "interface", php_sock,
-				&if_index TSRMLS_CC) == FAILURE) {
+				&if_index) == FAILURE) {
 					return FAILURE;
 			}
 
 			retval = mcast_req_fun(php_sock, level, (struct sockaddr*)&group,
-				glen, if_index TSRMLS_CC);
+				glen, if_index);
 			break;
 		}
 
@@ -210,25 +210,25 @@ mcast_req_fun:
 			opt_ht = HASH_OF(arg4);
 
 			if (php_get_address_from_array(opt_ht, "group", php_sock, &group,
-					&glen TSRMLS_CC) == FAILURE) {
+					&glen) == FAILURE) {
 				return FAILURE;
 			}
 			if (php_get_address_from_array(opt_ht, "source", php_sock, &source,
-					&slen TSRMLS_CC) == FAILURE) {
+					&slen) == FAILURE) {
 				return FAILURE;
 			}
 			if (php_get_if_index_from_array(opt_ht, "interface", php_sock,
-					&if_index TSRMLS_CC) == FAILURE) {
+					&if_index) == FAILURE) {
 				return FAILURE;
 			}
 
 			retval = mcast_sreq_fun(php_sock, level, (struct sockaddr*)&group,
-					glen, (struct sockaddr*)&source, slen, if_index TSRMLS_CC);
+					glen, (struct sockaddr*)&source, slen, if_index);
 			break;
 		}
 #endif
 	default:
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"unexpected option in php_do_mcast_opt (level %d, option %d). "
 			"This is a bug.", level, optname);
 		return FAILURE;
@@ -246,7 +246,7 @@ mcast_req_fun:
 int php_do_setsockopt_ip_mcast(php_socket *php_sock,
 							   int level,
 							   int optname,
-							   zval *arg4 TSRMLS_DC)
+							   zval *arg4)
 {
 	unsigned int	if_index;
 	struct in_addr	if_addr;
@@ -264,18 +264,18 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock,
 	case PHP_MCAST_JOIN_SOURCE_GROUP:
 	case PHP_MCAST_LEAVE_SOURCE_GROUP:
 #endif
-		if (php_do_mcast_opt(php_sock, level, optname, arg4 TSRMLS_CC) == FAILURE) {
+		if (php_do_mcast_opt(php_sock, level, optname, arg4) == FAILURE) {
 			return FAILURE;
 		} else {
 			return SUCCESS;
 		}
 
 	case IP_MULTICAST_IF:
-		if (php_get_if_index_from_zval(arg4, &if_index TSRMLS_CC) == FAILURE) {
+		if (php_get_if_index_from_zval(arg4, &if_index) == FAILURE) {
 			return FAILURE;
 		}
 
-		if (php_if_index_to_addr4(if_index, php_sock, &if_addr TSRMLS_CC) == FAILURE) {
+		if (php_if_index_to_addr4(if_index, php_sock, &if_addr) == FAILURE) {
 			return FAILURE;
 		}
 		opt_ptr = &if_addr;
@@ -290,7 +290,7 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock,
 	case IP_MULTICAST_TTL:
 		convert_to_long_ex(arg4);
 		if (Z_LVAL_P(arg4) < 0L || Z_LVAL_P(arg4) > 255L) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			php_error_docref(NULL, E_WARNING,
 					"Expected a value between 0 and 255");
 			return FAILURE;
 		}
@@ -316,7 +316,7 @@ dosockopt:
 int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
 								 int level,
 								 int optname,
-								 zval *arg4 TSRMLS_DC)
+								 zval *arg4)
 {
 	unsigned int	if_index;
 	void			*opt_ptr;
@@ -333,14 +333,14 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
 	case PHP_MCAST_JOIN_SOURCE_GROUP:
 	case PHP_MCAST_LEAVE_SOURCE_GROUP:
 #endif
-		if (php_do_mcast_opt(php_sock, level, optname, arg4 TSRMLS_CC) == FAILURE) {
+		if (php_do_mcast_opt(php_sock, level, optname, arg4) == FAILURE) {
 			return FAILURE;
 		} else {
 			return SUCCESS;
 		}
 
 	case IPV6_MULTICAST_IF:
-		if (php_get_if_index_from_zval(arg4, &if_index TSRMLS_CC) == FAILURE) {
+		if (php_get_if_index_from_zval(arg4, &if_index) == FAILURE) {
 			return FAILURE;
 		}
 
@@ -355,7 +355,7 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
 	case IPV6_MULTICAST_HOPS:
 		convert_to_long_ex(arg4);
 		if (Z_LVAL_P(arg4) < -1L || Z_LVAL_P(arg4) > 255L) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			php_error_docref(NULL, E_WARNING,
 					"Expected a value between -1 and 255");
 			return FAILURE;
 		}
@@ -383,9 +383,9 @@ int php_mcast_join(
 	int level,
 	struct sockaddr *group,
 	socklen_t group_len,
-	unsigned int if_index TSRMLS_DC)
+	unsigned int if_index)
 {
-	return _php_mcast_join_leave(sock, level, group, group_len, if_index, 1 TSRMLS_CC);
+	return _php_mcast_join_leave(sock, level, group, group_len, if_index, 1);
 }
 
 int php_mcast_leave(
@@ -393,9 +393,9 @@ int php_mcast_leave(
 	int level,
 	struct sockaddr *group,
 	socklen_t group_len,
-	unsigned int if_index TSRMLS_DC)
+	unsigned int if_index)
 {
-	return _php_mcast_join_leave(sock, level, group, group_len, if_index, 0 TSRMLS_CC);
+	return _php_mcast_join_leave(sock, level, group, group_len, if_index, 0);
 }
 
 #ifdef HAS_MCAST_EXT
@@ -406,9 +406,9 @@ int php_mcast_join_source(
 	socklen_t group_len,
 	struct sockaddr *source,
 	socklen_t source_len,
-	unsigned int if_index TSRMLS_DC)
+	unsigned int if_index)
 {
-	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, JOIN_SOURCE TSRMLS_CC);
+	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, JOIN_SOURCE);
 }
 
 int php_mcast_leave_source(
@@ -418,9 +418,9 @@ int php_mcast_leave_source(
 	socklen_t group_len,
 	struct sockaddr *source,
 	socklen_t source_len,
-	unsigned int if_index TSRMLS_DC)
+	unsigned int if_index)
 {
-	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, LEAVE_SOURCE TSRMLS_CC);
+	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, LEAVE_SOURCE);
 }
 
 int php_mcast_block_source(
@@ -430,9 +430,9 @@ int php_mcast_block_source(
 	socklen_t group_len,
 	struct sockaddr *source,
 	socklen_t source_len,
-	unsigned int if_index TSRMLS_DC)
+	unsigned int if_index)
 {
-	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, BLOCK_SOURCE TSRMLS_CC);
+	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, BLOCK_SOURCE);
 }
 
 int php_mcast_unblock_source(
@@ -442,9 +442,9 @@ int php_mcast_unblock_source(
 	socklen_t group_len,
 	struct sockaddr *source,
 	socklen_t source_len,
-	unsigned int if_index TSRMLS_DC)
+	unsigned int if_index)
 {
-	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, UNBLOCK_SOURCE TSRMLS_CC);
+	return _php_mcast_source_op(sock, level, group, group_len, source, source_len, if_index, UNBLOCK_SOURCE);
 }
 #endif /* HAS_MCAST_EXT */
 
@@ -455,7 +455,7 @@ static int _php_mcast_join_leave(
 	struct sockaddr *group, /* struct sockaddr_in/sockaddr_in6 */
 	socklen_t group_len,
 	unsigned int if_index,
-	int join TSRMLS_DC)
+	int join)
 {
 #ifdef RFC3678_API
 	struct group_req greq = {0};
@@ -475,7 +475,7 @@ static int _php_mcast_join_leave(
 		assert(group_len == sizeof(struct sockaddr_in));
 
 		if (if_index != 0) {
-			if (php_if_index_to_addr4(if_index, sock, &addr TSRMLS_CC) ==
+			if (php_if_index_to_addr4(if_index, sock, &addr) ==
 					FAILURE)
 				return -2; /* failure, but notice already emitted */
 			mreq.imr_interface = addr;
@@ -502,7 +502,7 @@ static int _php_mcast_join_leave(
 	}
 #endif
 	else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"Option %s is inapplicable to this socket type",
 			join ? "MCAST_JOIN_GROUP" : "MCAST_LEAVE_GROUP");
 		return -2;
@@ -519,7 +519,7 @@ static int _php_mcast_source_op(
 	struct sockaddr *source,
 	socklen_t source_len,
 	unsigned int if_index,
-	enum source_op sop TSRMLS_DC)
+	enum source_op sop)
 {
 #ifdef RFC3678_API
 	struct group_source_req gsreq = {0};
@@ -544,7 +544,7 @@ static int _php_mcast_source_op(
 		assert(source_len == sizeof(struct sockaddr_in));
 
 		if (if_index != 0) {
-			if (php_if_index_to_addr4(if_index, sock, &addr TSRMLS_CC) ==
+			if (php_if_index_to_addr4(if_index, sock, &addr) ==
 					FAILURE)
 				return -2; /* failure, but notice already emitted */
 			mreqs.imr_interface = addr;
@@ -557,14 +557,14 @@ static int _php_mcast_source_op(
 	}
 #if HAVE_IPV6
 	else if (sock->type == AF_INET6) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"This platform does not support %s for IPv6 sockets",
 			_php_source_op_to_string(sop));
 		return -2;
 	}
 #endif
 	else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"Option %s is inapplicable to this socket type",
 			_php_source_op_to_string(sop));
 		return -2;
@@ -628,7 +628,7 @@ static int _php_source_op_to_ipv4_op(enum source_op sop)
 #endif /* HAS_MCAST_EXT */
 
 #if PHP_WIN32
-int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr TSRMLS_DC)
+int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
 {
 	MIB_IPADDRTABLE *addr_table;
     ULONG size;
@@ -652,7 +652,7 @@ retry:
 		goto retry;
 	}
 	if (retval != NO_ERROR) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"GetIpAddrTable failed with error %lu", retval);
 		return FAILURE;
 	}
@@ -663,12 +663,12 @@ retry:
 			return SUCCESS;
 		}
 	}
-	php_error_docref(NULL TSRMLS_CC, E_WARNING,
+	php_error_docref(NULL, E_WARNING,
 		"No interface with index %u was found", if_index);
 	return FAILURE;
 }
 
-int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index TSRMLS_DC)
+int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index)
 {
 	MIB_IPADDRTABLE *addr_table;
     ULONG size;
@@ -692,7 +692,7 @@ retry:
 		goto retry;
 	}
 	if (retval != NO_ERROR) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"GetIpAddrTable failed with error %lu", retval);
 		return FAILURE;
 	}
@@ -707,7 +707,7 @@ retry:
 	{
 		char addr_str[17] = {0};
 		inet_ntop(AF_INET, addr, addr_str, sizeof(addr_str));
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"The interface with IP address %s was not found", addr_str);
 	}
 	return FAILURE;
@@ -715,7 +715,7 @@ retry:
 
 #else
 
-int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr TSRMLS_DC)
+int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
 {
 	struct ifreq if_req;
 
@@ -736,13 +736,13 @@ int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_add
 #else
 #error Neither SIOCGIFNAME nor if_indextoname are available
 #endif
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"Failed obtaining address for interface %u: error %d", if_index, errno);
 		return FAILURE;
 	}
 
 	if (ioctl(php_sock->bsd_socket, SIOCGIFADDR, &if_req) == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"Failed obtaining address for interface %u: error %d", if_index, errno);
 		return FAILURE;
 	}
@@ -752,7 +752,7 @@ int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_add
 	return SUCCESS;
 }
 
-int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index TSRMLS_DC)
+int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index)
 {
 	struct ifconf	if_conf = {0};
 	char			*buf = NULL,
@@ -774,7 +774,7 @@ int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *i
 
 		if (ioctl(php_sock->bsd_socket, SIOCGIFCONF, (char*)&if_conf) == -1 &&
 				(errno != EINVAL || lastsize != 0)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			php_error_docref(NULL, E_WARNING,
 				"Failed obtaining interfaces list: error %d", errno);
 			goto err;
 		}
@@ -817,7 +817,7 @@ int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *i
 #else
 #error Neither SIOCGIFINDEX nor if_nametoindex are available
 #endif
-				php_error_docref(NULL TSRMLS_CC, E_WARNING,
+				php_error_docref(NULL, E_WARNING,
 					"Error converting interface name to index: error %d",
 					errno);
 				goto err;
@@ -836,7 +836,7 @@ int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *i
 	{
 		char addr_str[17] = {0};
 		inet_ntop(AF_INET, addr, addr_str, sizeof(addr_str));
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 			"The interface with IP address %s was not found", addr_str);
 	}