Use bool and zend_result where it makes sense in sockets extension

Author: Girgias

ext/sockets/multicast.c

@@ -59,7 +59,7 @@ static const char *_php_source_op_to_string(enum source_op sop);
 static int _php_source_op_to_ipv4_op(enum source_op sop);
 #endif
 
-int php_string_to_if_index(const char *val, unsigned *out)
+zend_result php_string_to_if_index(const char *val, unsigned *out)
 {
 #if HAVE_IF_NAMETOINDEX
 	unsigned int ind;
@@ -81,7 +81,7 @@ int php_string_to_if_index(const char *val, unsigned *out)
 #endif
 }
 
-static int php_get_if_index_from_zval(zval *val, unsigned *out)
+static zend_result php_get_if_index_from_zval(zval *val, unsigned *out)
 {
 	int ret;
 
@@ -104,7 +104,7 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out)
 
 
 
-static int php_get_if_index_from_array(const HashTable *ht, const char *key,
+static zend_result php_get_if_index_from_array(const HashTable *ht, const char *key,
 	php_socket *sock, unsigned int *if_index)
 {
 	zval *val;
@@ -117,7 +117,7 @@ static int php_get_if_index_from_array(const HashTable *ht, const char *key,
 	return php_get_if_index_from_zval(val, if_index);
 }
 
-static int php_get_address_from_array(const HashTable *ht, const char *key,
+static zend_result php_get_address_from_array(const HashTable *ht, const char *key,
 	php_socket *sock, php_sockaddr_storage *ss, socklen_t *ss_len)
 {
 	zval *val;
@@ -136,7 +136,7 @@ static int php_get_address_from_array(const HashTable *ht, const char *key,
 	return SUCCESS;
 }
 
-static int php_do_mcast_opt(php_socket *php_sock, int level, int optname, zval *arg4)
+static zend_result php_do_mcast_opt(php_socket *php_sock, int level, int optname, zval *arg4)
 {
 	HashTable		 		*opt_ht;
 	unsigned int			if_index;
@@ -616,7 +616,7 @@ static int _php_source_op_to_ipv4_op(enum source_op sop)
 #endif /* HAS_MCAST_EXT */
 
 #ifdef PHP_WIN32
-int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
+zend_result php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
 {
 	MIB_IPADDRTABLE *addr_table;
     ULONG size;
@@ -659,7 +659,7 @@ int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_add
 	return FAILURE;
 }
 
-int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index)
+zend_result php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index)
 {
 	MIB_IPADDRTABLE *addr_table;
     ULONG size;
@@ -709,7 +709,7 @@ int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *i
 
 #else
 
-int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
+zend_result php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
 {
 	struct ifreq if_req;
 
@@ -746,7 +746,7 @@ int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_add
 	return SUCCESS;
 }
 
-int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index)
+zend_result php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *if_index)
 {
 	struct ifconf	if_conf = {0};
 	char			*buf = NULL,

ext/sockets/multicast.h

@@ -51,17 +51,17 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
 								 int optname,
 								 zval *arg4);
 
-int php_if_index_to_addr4(
+zend_result php_if_index_to_addr4(
         unsigned if_index,
         php_socket *php_sock,
         struct in_addr *out_addr);
 
-int php_add4_to_if_index(
+zend_result php_add4_to_if_index(
         struct in_addr *addr,
         php_socket *php_sock,
         unsigned *if_index);
 
-int php_string_to_if_index(const char *val, unsigned *out);
+zend_result php_string_to_if_index(const char *val, unsigned *out);
 
 int php_mcast_join(
 	php_socket *sock,

ext/sockets/php_sockets.h

@@ -126,7 +126,7 @@ enum sockopt_return {
 };
 
 PHP_SOCKETS_API char *sockets_strerror(int error);
-PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock);
+PHP_SOCKETS_API bool socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock);
 
 #else
 #define phpext_sockets_ptr NULL

ext/sockets/sockaddr_conv.c

@@ -9,7 +9,7 @@
 #include <arpa/inet.h>
 #endif
 
-extern int php_string_to_if_index(const char *val, unsigned *out);
+extern zend_result php_string_to_if_index(const char *val, unsigned *out);
 
 #if HAVE_IPV6
 /* Sets addr by hostname, or by ip in string form (AF_INET6) */

ext/sockets/sockets.c

@@ -223,7 +223,7 @@ ZEND_GET_MODULE(sockets)
 int inet_ntoa_lock = 0;
 #endif
 
-static int php_open_listen_sock(php_socket *sock, int port, int backlog) /* {{{ */
+static bool php_open_listen_sock(php_socket *sock, int port, int backlog) /* {{{ */
 {
 	struct sockaddr_in  la;
 	struct hostent		*hp;
@@ -266,7 +266,7 @@ static int php_open_listen_sock(php_socket *sock, int port, int backlog) /* {{{
 }
 /* }}} */
 
-static int php_accept_connect(php_socket *in_sock, php_socket *out_sock, struct sockaddr *la, socklen_t *la_len) /* {{{ */
+static bool php_accept_connect(php_socket *in_sock, php_socket *out_sock, struct sockaddr *la, socklen_t *la_len) /* {{{ */
 {
 	out_sock->bsd_socket = accept(in_sock->bsd_socket, la, la_len);
 
@@ -2179,7 +2179,7 @@ PHP_FUNCTION(socket_clear_error)
 }
 /* }}} */
 
-int socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock)
+bool socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock)
 {
 #ifdef SO_DOMAIN
 	int						type;