use zval_get_long

diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 240580cbcd7c819543e3a7485364939e0b6b8756..89a16e7bad87d92097fe0e2456660c535b26f3f6 100644 (file)
--- 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 294b475b31739e83052c1af93f9323610124f5a9..078518f8ac0b4de8028ac0215f8783edd842cea5 100644 (file)
--- 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: