More conversions

Author: Girgias

ext/sockets/multicast.c

@@ -87,14 +87,12 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out)
 
 	if (Z_TYPE_P(val) == IS_LONG) {
 		if (Z_LVAL_P(val) < 0 || (zend_ulong)Z_LVAL_P(val) > UINT_MAX) {
-			php_error_docref(NULL, E_WARNING,
-				"the interface index cannot be negative or larger than %u;"
-				" given " ZEND_LONG_FMT, UINT_MAX, Z_LVAL_P(val));
-			ret = FAILURE;
-		} else {
-			*out = Z_LVAL_P(val);
-			ret = SUCCESS;
+			zend_value_error("The interface index cannot be negative or larger than %u; given " ZEND_LONG_FMT,
+					UINT_MAX, Z_LVAL_P(val));
+			return FAILURE;
 		}
+		*out = Z_LVAL_P(val);
+		ret = SUCCESS;
 	} else {
 		zend_string *tmp_str;
 		zend_string *str = zval_get_tmp_string(val, &tmp_str);
@@ -127,7 +125,7 @@ static int php_get_address_from_array(const HashTable *ht, const char *key,
 	zend_string *str, *tmp_str;
 
 	if ((val = zend_hash_str_find(ht, key, strlen(key))) == NULL) {
-		php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", key);
+		zend_value_error("No key \"%s\" passed in optval", key);
 		return FAILURE;
 	}
 	str = zval_get_tmp_string(val, &tmp_str);
@@ -282,8 +280,7 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock,
 	case IP_MULTICAST_TTL:
 		convert_to_long_ex(arg4);
 		if (Z_LVAL_P(arg4) < 0L || Z_LVAL_P(arg4) > 255L) {
-			php_error_docref(NULL, E_WARNING,
-					"Expected a value between 0 and 255");
+			zend_value_error("Expected a value between 0 and 255");
 			return FAILURE;
 		}
 		ipv4_mcast_ttl_lback = (unsigned char) Z_LVAL_P(arg4);
@@ -347,8 +344,7 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
 	case IPV6_MULTICAST_HOPS:
 		convert_to_long_ex(arg4);
 		if (Z_LVAL_P(arg4) < -1L || Z_LVAL_P(arg4) > 255L) {
-			php_error_docref(NULL, E_WARNING,
-					"Expected a value between -1 and 255");
+			zend_value_error("Expected a value between -1 and 255");
 			return FAILURE;
 		}
 		ov = (int) Z_LVAL_P(arg4);
@@ -496,8 +492,7 @@ static int _php_mcast_join_leave(
 	}
 #endif
 	else {
-		php_error_docref(NULL, E_WARNING,
-			"Option %s is inapplicable to this socket type",
+		zend_value_error("Option %s is inapplicable to this socket type",
 			join ? "MCAST_JOIN_GROUP" : "MCAST_LEAVE_GROUP");
 		return -2;
 	}

ext/sockets/sendrecvmsg.c

@@ -69,8 +69,8 @@ inline ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags)
 #define LONG_CHECK_VALID_INT(l) \
 	do { \
 		if ((l) < INT_MIN && (l) > INT_MAX) { \
-			php_error_docref(NULL, E_WARNING, "The value " ZEND_LONG_FMT " does not fit inside " \
-					"the boundaries of a native integer", (l)); \
+			zend_value_error("The value " ZEND_LONG_FMT " does not fit inside the boundaries of a native integer", \
+					(l)); \
 			return; \
 		} \
 	} while (0)
@@ -290,23 +290,21 @@ PHP_FUNCTION(socket_cmsg_space)
 	LONG_CHECK_VALID_INT(n);
 
 	if (n < 0) {
-		php_error_docref(NULL, E_WARNING, "The third argument "
-				"cannot be negative");
+		zend_value_error("The third argument cannot be negative");
 		return;
 	}
 
 	entry = get_ancillary_reg_entry(level, type);
 	if (entry == NULL) {
-		php_error_docref(NULL, E_WARNING, "The pair level " ZEND_LONG_FMT "/type " ZEND_LONG_FMT " is "
-				"not supported by PHP", level, type);
+		zend_value_error("The pair level " ZEND_LONG_FMT "/type " ZEND_LONG_FMT " is not supported by PHP",
+			level, type);
 		return;
 	}
 
 	if (entry->var_el_size > 0 && n > (zend_long)((ZEND_LONG_MAX - entry->size -
 			CMSG_SPACE(0) - 15L) / entry->var_el_size)) {
 		/* the -15 is to account for any padding CMSG_SPACE may add after the data */
-		php_error_docref(NULL, E_WARNING, "The value for the "
-				"third argument (" ZEND_LONG_FMT ") is too large", n);
+		zend_value_error("The value for the third argument (" ZEND_LONG_FMT ") is too large", n);
 		return;
 	}