diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/sockets/sockets.c | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/sockets/sockets.c')
| -rw-r--r-- | ext/sockets/sockets.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 19e1c76d38..e1caa19fc5 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1152,9 +1152,9 @@ PHP_FUNCTION(socket_read) } if (type == PHP_NORMAL_READ) { - retval = php_read(php_sock, tmpbuf->val, length, 0); + retval = php_read(php_sock, ZSTR_VAL(tmpbuf), length, 0); } else { - retval = recv(php_sock->bsd_socket, tmpbuf->val, length, 0); + retval = recv(php_sock->bsd_socket, ZSTR_VAL(tmpbuf), length, 0); } if (retval == -1) { @@ -1179,8 +1179,8 @@ PHP_FUNCTION(socket_read) } tmpbuf = zend_string_truncate(tmpbuf, retval, 0); - tmpbuf->len = retval; - tmpbuf->val[tmpbuf->len] = '\0' ; + ZSTR_LEN(tmpbuf) = retval; + ZSTR_VAL(tmpbuf)[ZSTR_LEN(tmpbuf)] = '\0' ; RETURN_NEW_STR(tmpbuf); } @@ -1608,14 +1608,14 @@ PHP_FUNCTION(socket_recv) recv_buf = zend_string_alloc(len, 0); - if ((retval = recv(php_sock->bsd_socket, recv_buf->val, len, flags)) < 1) { + if ((retval = recv(php_sock->bsd_socket, ZSTR_VAL(recv_buf), len, flags)) < 1) { efree(recv_buf); zval_dtor(buf); ZVAL_NULL(buf); } else { - recv_buf->len = retval; - recv_buf->val[recv_buf->len] = '\0'; + ZSTR_LEN(recv_buf) = retval; + ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; /* Rebuild buffer zval */ zval_dtor(buf); @@ -1697,15 +1697,15 @@ PHP_FUNCTION(socket_recvfrom) case AF_UNIX: slen = sizeof(s_un); s_un.sun_family = AF_UNIX; - retval = recvfrom(php_sock->bsd_socket, recv_buf->val, arg3, arg4, (struct sockaddr *)&s_un, (socklen_t *)&slen); + retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&s_un, (socklen_t *)&slen); if (retval < 0) { PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno); zend_string_free(recv_buf); RETURN_FALSE; } - recv_buf->len = retval; - recv_buf->val[recv_buf->len] = '\0'; + ZSTR_LEN(recv_buf) = retval; + ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; zval_dtor(arg2); zval_dtor(arg5); @@ -1724,15 +1724,15 @@ PHP_FUNCTION(socket_recvfrom) WRONG_PARAM_COUNT; } - retval = recvfrom(php_sock->bsd_socket, recv_buf->val, arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen); + retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen); if (retval < 0) { PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno); zend_string_free(recv_buf); RETURN_FALSE; } - recv_buf->len = retval; - recv_buf->val[recv_buf->len] = '\0'; + ZSTR_LEN(recv_buf) = retval; + ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; zval_dtor(arg2); zval_dtor(arg5); @@ -1755,15 +1755,15 @@ PHP_FUNCTION(socket_recvfrom) WRONG_PARAM_COUNT; } - retval = recvfrom(php_sock->bsd_socket, recv_buf->val, arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen); + retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen); if (retval < 0) { PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno); zend_string_free(recv_buf); RETURN_FALSE; } - recv_buf->len = retval; - recv_buf->val[recv_buf->len] = '\0'; + ZSTR_LEN(recv_buf) = retval; + ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; zval_dtor(arg2); zval_dtor(arg5); |