diff options
Diffstat (limited to 'ext/curl/multi.c')
-rw-r--r-- | ext/curl/multi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 5550972bba..72cfd29ca7 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -92,7 +92,7 @@ PHP_FUNCTION(curl_multi_add_handle) zend_llist_add_element(&mh->easyh, &tmp_val); - RETURN_LONG((long)curl_multi_add_handle(mh->multi, ch->cp)); + RETURN_LONG((zend_long)curl_multi_add_handle(mh->multi, ch->cp)); } /* }}} */ @@ -140,7 +140,7 @@ PHP_FUNCTION(curl_multi_remove_handle) ZEND_FETCH_RESOURCE(mh, php_curlm *, z_mh, -1, le_curl_multi_handle_name, le_curl_multi_handle); ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl); - RETVAL_LONG((long)curl_multi_remove_handle(mh->multi, ch->cp)); + RETVAL_LONG((zend_long)curl_multi_remove_handle(mh->multi, ch->cp)); zend_llist_del_element(&mh->easyh, &z_ch, (int (*)(void *, void *))curl_compare_resources); } @@ -242,7 +242,7 @@ PHP_FUNCTION(curl_multi_getcontent) if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.s) { smart_str_0(&ch->handlers->write->buf); - RETURN_STR(STR_COPY(ch->handlers->write->buf.s)); + RETURN_STR(zend_string_copy(ch->handlers->write->buf.s)); } RETURN_EMPTY_STRING(); @@ -357,7 +357,7 @@ void _php_curl_multi_close(zend_resource *rsrc TSRMLS_DC) /* {{{ */ return string describing error code */ PHP_FUNCTION(curl_multi_strerror) { - long code; + zend_long code; const char *str; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) { @@ -375,7 +375,7 @@ PHP_FUNCTION(curl_multi_strerror) #endif #if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */ -static int _php_curl_multi_setopt(php_curlm *mh, long option, zval *zvalue, zval *return_value TSRMLS_DC) /* {{{ */ +static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue, zval *return_value TSRMLS_DC) /* {{{ */ { CURLMcode error = CURLM_OK; @@ -409,7 +409,7 @@ static int _php_curl_multi_setopt(php_curlm *mh, long option, zval *zvalue, zval PHP_FUNCTION(curl_multi_setopt) { zval *z_mh, *zvalue; - long options; + zend_long options; php_curlm *mh; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_mh, &options, &zvalue) == FAILURE) { |