diff options
| author | Xinchen Hui <laruence@php.net> | 2015-05-06 10:58:01 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-05-06 10:58:01 +0800 |
| commit | 13eb630eeb1ff934a6e9decaaf1eb73527601586 (patch) | |
| tree | aed8379b4b1a2fb3363f38c1987794e79c6f277d | |
| parent | 55d94a453243cafc2292920e9c91bd2bc551f2be (diff) | |
| download | php-git-13eb630eeb1ff934a6e9decaaf1eb73527601586.tar.gz | |
use zval_get_long
| -rw-r--r-- | ext/curl/multi.c | 6 | ||||
| -rw-r--r-- | ext/curl/share.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 240580cbcd..89a16e7bad 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -235,8 +235,7 @@ PHP_FUNCTION(curl_multi_exec) } } - convert_to_long_ex(z_still_running); - still_running = Z_LVAL_P(z_still_running); + still_running = zval_get_long(z_still_running); result = curl_multi_perform(mh->multi, &still_running); ZVAL_LONG(z_still_running, still_running); @@ -416,8 +415,7 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue, #if LIBCURL_VERSION_NUM >= 0x071003 /* 7.16.3 */ case CURLMOPT_MAXCONNECTS: #endif - convert_to_long_ex(zvalue); - error = curl_multi_setopt(mh->multi, option, Z_LVAL_P(zvalue)); + error = curl_multi_setopt(mh->multi, option, zval_get_long(zvalue)); break; default: diff --git a/ext/curl/share.c b/ext/curl/share.c index 294b475b31..078518f8ac 100644 --- a/ext/curl/share.c +++ b/ext/curl/share.c @@ -76,8 +76,7 @@ static int _php_curl_share_setopt(php_curlsh *sh, zend_long option, zval *zvalue switch (option) { case CURLSHOPT_SHARE: case CURLSHOPT_UNSHARE: - convert_to_long_ex(zvalue); - error = curl_share_setopt(sh->share, option, Z_LVAL_P(zvalue)); + error = curl_share_setopt(sh->share, option, zval_get_long(zvalue)); break; default: |