From: Xinchen Hui <laruence@php.net>
Date: Wed, 6 May 2015 02:58:01 +0000 (+0800)
Subject: use zval_get_long
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13eb630eeb1ff934a6e9decaaf1eb73527601586;p=php

use zval_get_long
---

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: