archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

main/network: Use more appropriate types (#15511)

Browse source 
* main/network: Use more appropriate types

And check directly against 0 for success for functions not returning a zend_result

* Remove redundant declaration in file.h

Not sure why it even is here
This commit is contained in:
Gina Peter Banyard 2024-08-22 12:48:28 +01:00 • committed by GitHub
parent 15ea82da2b
commit 35fbb0061d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/standard/file.h
View file

@ -37,7 +37,6 @@ PHPAPI PHP_FUNCTION(fpassthru);
PHP_MINIT_FUNCTION(user_streams); PHP_MINIT_FUNCTION(user_streams);
PHPAPI int php_le_stream_context(void); 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(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_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); PHPAPI zend_result php_copy_file_ctx(const char *src, const char *dest, int src_flags, php_stream_context *ctx);

16
main/network.c
View file

@ -499,11 +499,11 @@ bound:
} }
/* }}} */ /* }}} */
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 *colon;
char *tmp; char *tmp;
int ret = FAILURE; zend_result ret = FAILURE;
short port; short port;
struct sockaddr_in *in4 = (struct sockaddr_in*)sa; struct sockaddr_in *in4 = (struct sockaddr_in*)sa;
struct sockaddr **psal; struct sockaddr **psal;
@ -843,7 +843,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
#endif #endif
} local_address = {0}; } local_address = {0};
int local_address_len = 0; size_t local_address_len = 0;
if (sa->sa_family == AF_INET) { if (sa->sa_family == AF_INET) {
if (inet_pton(AF_INET, bindto, &local_address.in4.sin_addr) == 1) { if (inet_pton(AF_INET, bindto, &local_address.in4.sin_addr) == 1) {
@ -974,7 +974,7 @@ PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short
/* {{{ php_sockaddr_size /* {{{ php_sockaddr_size
* Returns the size of struct sockaddr_xx for the family * 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) { switch (((struct sockaddr *)addr)->sa_family) {
case AF_INET: case AF_INET:
@ -1099,9 +1099,9 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p
return stream; 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 #ifdef PHP_WIN32
u_long flags; u_long flags;
@ -1253,7 +1253,7 @@ static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf
*tmphstbuf = (char *)realloc (*tmphstbuf,*hstbuflen); *tmphstbuf = (char *)realloc (*tmphstbuf,*hstbuflen);
} }
if (res != SUCCESS) { if (res != 0) {
return NULL; return NULL;
} }
@ -1295,7 +1295,7 @@ static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf
} }
memset((void *)(*tmphstbuf),0,*hstbuflen); 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; return NULL;
} }

8
main/php_network.h
View file

@ -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 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() END_EXTERN_C()
struct _php_netstream_data_t { struct _php_netstream_data_t {
@ -336,12 +336,12 @@ PHPAPI void php_network_populate_name_from_sockaddr(
socklen_t *addrlen socklen_t *addrlen
); );
PHPAPI int php_network_parse_network_address_with_port(const char *addr, PHPAPI zend_result php_network_parse_network_address_with_port(const char *addr,
zend_long addrlen, struct sockaddr *sa, socklen_t *sl); size_t addrlen, struct sockaddr *sa, socklen_t *sl);
PHPAPI struct hostent* php_network_gethostbyname(const char *name); 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() END_EXTERN_C()
#define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC) #define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC)