com php-src: use zval_get_long: ext/curl/multi.c ex t/curl/share.c
| From: | Xinchen Hui | Date: | Wed, 06 May 2015 02:58:01 +0000 |
| Subject: | com php-src: use zval_get_long: ext/curl/multi.c ex t/curl/share.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86616@lists.php.net to get a copy of this message | ||
Commit: 13eb630eeb1ff934a6e9decaaf1eb73527601586
Author: Xinchen Hui <laruence@php.net> Wed, 6 May 2015 10:58:01 +0800
Parents: 55d94a453243cafc2292920e9c91bd2bc551f2be
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13eb630eeb1ff934a6e9decaaf1eb73527601586
Log:
use zval_get_long
Changed paths:
M ext/curl/multi.c
M ext/curl/share.c
Diff:
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 240580c..89a16e7 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 294b475..078518f 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: