php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 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 {
@@ -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)