diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 08:07:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 08:07:31 +0200 |
| commit | 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (patch) | |
| tree | e561a58d6e084c5e4cbdde1f84aed16cf4724383 /ext/sockets/multicast.c | |
| parent | 1e8273964fbd517a2eb9e560f9cdb4afffa0c034 (diff) | |
| download | php-git-63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc.tar.gz | |
basic macro replacements, all at once
Diffstat (limited to 'ext/sockets/multicast.c')
| -rw-r--r-- | ext/sockets/multicast.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 2bc86b1dba..0fc3dbb2cf 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -89,14 +89,14 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out TSRMLS_DC) { int ret; - if (Z_TYPE_P(val) == IS_LONG) { - if (Z_LVAL_P(val) < 0 || Z_LVAL_P(val) > UINT_MAX) { + if (Z_TYPE_P(val) == IS_INT) { + if (Z_IVAL_P(val) < 0 || Z_IVAL_P(val) > UINT_MAX) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "the interface index cannot be negative or larger than %u;" - " given %ld", UINT_MAX, Z_LVAL_P(val)); + " given %ld", UINT_MAX, Z_IVAL_P(val)); ret = FAILURE; } else { - *out = Z_LVAL_P(val); + *out = Z_IVAL_P(val); ret = SUCCESS; } } else { @@ -288,13 +288,13 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock, goto ipv4_loop_ttl; case IP_MULTICAST_TTL: - convert_to_long_ex(arg4); - if (Z_LVAL_P(arg4) < 0L || Z_LVAL_P(arg4) > 255L) { + convert_to_int_ex(arg4); + if (Z_IVAL_P(arg4) < 0L || Z_IVAL_P(arg4) > 255L) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected a value between 0 and 255"); return FAILURE; } - ipv4_mcast_ttl_lback = (unsigned char) Z_LVAL_P(arg4); + ipv4_mcast_ttl_lback = (unsigned char) Z_IVAL_P(arg4); ipv4_loop_ttl: opt_ptr = &ipv4_mcast_ttl_lback; optlen = sizeof(ipv4_mcast_ttl_lback); @@ -353,13 +353,13 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock, ov = (int) Z_TYPE_P(arg4) == IS_TRUE; goto ipv6_loop_hops; case IPV6_MULTICAST_HOPS: - convert_to_long_ex(arg4); - if (Z_LVAL_P(arg4) < -1L || Z_LVAL_P(arg4) > 255L) { + convert_to_int_ex(arg4); + if (Z_IVAL_P(arg4) < -1L || Z_IVAL_P(arg4) > 255L) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected a value between -1 and 255"); return FAILURE; } - ov = (int) Z_LVAL_P(arg4); + ov = (int) Z_IVAL_P(arg4); ipv6_loop_hops: opt_ptr = &ov; optlen = sizeof(ov); |