Skip to content

main/network: Use more appropriate types #15511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2024
Merged

main/network: Use more appropriate types #15511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab204e3
main/network: Use more appropriate types
Girgias Aug 20, 2024
8a9c845
Remove redundant declaration in file.h
Girgias Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ext/standard/file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ PHPAPI PHP_FUNCTION(fpassthru);
PHP_MINIT_FUNCTION(user_streams);

PHPAPI int php_le_stream_context(void);
PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block);
PHPAPI zend_result php_copy_file(const char *src, const char *dest);
PHPAPI zend_result php_copy_file_ex(const char *src, const char *dest, int src_flags);
PHPAPI zend_result php_copy_file_ctx(const char *src, const char *dest, int src_flags, php_stream_context *ctx);
Expand Down
16 changes: 8 additions & 8 deletions main/network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,11 @@ php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned po
}
/* }}} */

PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_long addrlen, struct sockaddr *sa, socklen_t *sl)
PHPAPI zend_result php_network_parse_network_address_with_port(const char *addr, size_t addrlen, struct sockaddr *sa, socklen_t *sl)
{
char *colon;
char *tmp;
int ret = FAILURE;
zend_result ret = FAILURE;
short port;
struct sockaddr_in *in4 = (struct sockaddr_in*)sa;
struct sockaddr **psal;
Expand Down Expand Up @@ -843,7 +843,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
struct sockaddr_in6 in6;
#endif
} local_address = {0};
int local_address_len = 0;
size_t local_address_len = 0;

if (sa->sa_family == AF_INET) {
if (inet_pton(AF_INET, bindto, &local_address.in4.sin_addr) == 1) {
Expand Down Expand Up @@ -974,7 +974,7 @@ PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short
/* {{{ php_sockaddr_size
* Returns the size of struct sockaddr_xx for the family
*/
PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr)
PHPAPI socklen_t php_sockaddr_size(php_sockaddr_storage *addr)
{
switch (((struct sockaddr *)addr)->sa_family) {
case AF_INET:
Expand Down Expand Up @@ -1099,9 +1099,9 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p
return stream;
}

PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block)
PHPAPI zend_result php_set_sock_blocking(php_socket_t socketd, bool block)
{
int ret = SUCCESS;
zend_result ret = SUCCESS;

#ifdef PHP_WIN32
u_long flags;
Expand Down Expand Up @@ -1253,7 +1253,7 @@ static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf
*tmphstbuf = (char *)realloc (*tmphstbuf,*hstbuflen);
}

if (res != SUCCESS) {
if (res != 0) {
return NULL;
}

Expand Down Expand Up @@ -1295,7 +1295,7 @@ static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf
}
memset((void *)(*tmphstbuf),0,*hstbuflen);

if (SUCCESS != gethostbyname_r(host,hostbuf,(struct hostent_data *)*tmphstbuf)) {
if (0 != gethostbyname_r(host,hostbuf,(struct hostent_data *)*tmphstbuf)) {
return NULL;
}

Expand Down
8 changes: 4 additions & 4 deletions main/php_network.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock,
);

PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port);
PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr);
PHPAPI socklen_t php_sockaddr_size(php_sockaddr_storage *addr);
END_EXTERN_C()

struct _php_netstream_data_t {
Expand Down Expand Up @@ -336,12 +336,12 @@ PHPAPI void php_network_populate_name_from_sockaddr(
socklen_t *addrlen
);

PHPAPI int php_network_parse_network_address_with_port(const char *addr,
zend_long addrlen, struct sockaddr *sa, socklen_t *sl);
PHPAPI zend_result php_network_parse_network_address_with_port(const char *addr,
size_t addrlen, struct sockaddr *sa, socklen_t *sl);

PHPAPI struct hostent* php_network_gethostbyname(const char *name);

PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block);
PHPAPI zend_result php_set_sock_blocking(php_socket_t socketd, bool block);
END_EXTERN_C()

#define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC)
Expand Down
Loading