]> granicus.if.org Git - php/commitdiff
Eliminate useless separations
authorDmitry Stogov <dmitry@zend.com>
Wed, 17 Jan 2018 09:45:23 +0000 (12:45 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 17 Jan 2018 09:45:23 +0000 (12:45 +0300)
ext/sockets/sendrecvmsg.c
ext/sockets/sockets.c

index a16e7c8cbbd1f4fec68a83eb66c083c018c6a5d5..7b9c4e8ad357b73b514dc5feb8dc8d9ca215126b 100644 (file)
@@ -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 {
index 83d54c1b9205421cfdf1fb8e1833309f7ce17721..95ec940c68d91c6162980afc7a64d31acd9a1569 100644 (file)
@@ -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;
        }