From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 17 Jan 2018 09:45:23 +0000 (+0300)
Subject: Eliminate useless separations
X-Git-Tag: php-7.3.0alpha1~602^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67e47c3ee3b7aa5227639a2370acacaebc24c391;p=php

Eliminate useless separations
---

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index a16e7c8cbb..7b9c4e8ad3 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -219,7 +219,7 @@ PHP_FUNCTION(socket_recvmsg)
 	struct err_s	err = {0};
 
 	//ssize_t recvmsg(int sockfd, struct msghdr *msg, int flags);
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ra/|l",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ra|l",
 			&zsocket, &zmsg, &flags) == FAILURE) {
 		return;
 	}
@@ -256,7 +256,7 @@ PHP_FUNCTION(socket_recvmsg)
 		msghdr = NULL;
 		allocations_dispose(&allocations);
 
-		zval_dtor(zmsg);
+		zval_ptr_dtor(zmsg);
 		if (!err.has_error) {
 			ZVAL_COPY_VALUE(zmsg, zres);
 		} else {
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 83d54c1b92..95ec940c68 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -919,7 +919,7 @@ PHP_FUNCTION(socket_select)
 	int				retval, sets = 0;
 	zend_long			usec = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!a/!a/!z!|l", &r_array, &w_array, &e_array, &sec, &usec) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!a!z!|l", &r_array, &w_array, &e_array, &sec, &usec) == FAILURE) {
 		return;
 	}