diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-24 22:39:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-24 22:39:59 +0300 |
| commit | ad4fa8f75810facff8bea509249a735232235443 (patch) | |
| tree | 13b4b2f3df2a2df85a8d3b9702024ac8213f37a7 /ext/sockets | |
| parent | abf6a0b376b42e0ce60da039b11c6fdf994431fb (diff) | |
| download | php-git-ad4fa8f75810facff8bea509249a735232235443.tar.gz | |
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/multicast.c | 4 | ||||
| -rw-r--r-- | ext/sockets/sockets.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 8d84ccc642..a0d3e132a1 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -171,7 +171,7 @@ static int php_do_mcast_opt(php_socket *php_sock, int level, int optname, zval * mcast_req_fun = &php_mcast_leave; mcast_req_fun: convert_to_array_ex(arg4); - opt_ht = HASH_OF(arg4); + opt_ht = Z_ARRVAL_P(arg4); if (php_get_address_from_array(opt_ht, "group", php_sock, &group, &glen) == FAILURE) { @@ -207,7 +207,7 @@ mcast_req_fun: mcast_sreq_fun = &php_mcast_leave_source; mcast_sreq_fun: convert_to_array_ex(arg4); - opt_ht = HASH_OF(arg4); + opt_ht = Z_ARRVAL_P(arg4); if (php_get_address_from_array(opt_ht, "group", php_sock, &group, &glen) == FAILURE) { diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index e1caa19fc5..4385093fe9 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -2035,7 +2035,7 @@ PHP_FUNCTION(socket_set_option) const char l_linger_key[] = "l_linger"; convert_to_array_ex(arg4); - opt_ht = HASH_OF(arg4); + opt_ht = Z_ARRVAL_P(arg4); if ((l_onoff = zend_hash_str_find(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) { php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", l_onoff_key); @@ -2063,7 +2063,7 @@ PHP_FUNCTION(socket_set_option) const char usec_key[] = "usec"; convert_to_array_ex(arg4); - opt_ht = HASH_OF(arg4); + opt_ht = Z_ARRVAL_P(arg4); if ((sec = zend_hash_str_find(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) { php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", sec_key); |