diff options
Diffstat (limited to 'ext/curl/multi.c')
| -rw-r--r-- | ext/curl/multi.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index d9ace4119c..60f3e72ec5 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -78,7 +78,7 @@ PHP_FUNCTION(curl_multi_add_handle) php_curl *ch; zval tmp_val; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &z_mh, &z_ch) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &z_mh, &z_ch) == FAILURE) { return; } @@ -100,13 +100,12 @@ void _php_curl_multi_cleanup_list(void *data) /* {{{ */ { zval *z_ch = (zval *)data; php_curl *ch; - TSRMLS_FETCH(); if (!z_ch) { return; } - ch = zend_fetch_resource(z_ch TSRMLS_CC, -1, le_curl_name, NULL, 1, le_curl); + ch = zend_fetch_resource(z_ch, -1, le_curl_name, NULL, 1, le_curl); if (!ch) { return; } @@ -133,7 +132,7 @@ PHP_FUNCTION(curl_multi_remove_handle) php_curlm *mh; php_curl *ch; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &z_mh, &z_ch) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &z_mh, &z_ch) == FAILURE) { return; } @@ -169,7 +168,7 @@ PHP_FUNCTION(curl_multi_select) double timeout = 1.0; struct timeval to; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|d", &z_mh, &timeout) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|d", &z_mh, &timeout) == FAILURE) { return; } @@ -199,7 +198,7 @@ PHP_FUNCTION(curl_multi_exec) int still_running; int result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/", &z_mh, &z_still_running) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/", &z_mh, &z_still_running) == FAILURE) { return; } @@ -214,7 +213,7 @@ PHP_FUNCTION(curl_multi_exec) pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) { ZEND_FETCH_RESOURCE(ch, php_curl *, pz_ch, -1, le_curl_name, le_curl); - _php_curl_verify_handlers(ch, 1 TSRMLS_CC); + _php_curl_verify_handlers(ch, 1); } } @@ -234,7 +233,7 @@ PHP_FUNCTION(curl_multi_getcontent) zval *z_ch; php_curl *ch; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ch) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ch) == FAILURE) { return; } @@ -262,7 +261,7 @@ PHP_FUNCTION(curl_multi_info_read) int queued_msgs; zval *zmsgs_in_queue = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|z/", &z_mh, &zmsgs_in_queue) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|z/", &z_mh, &zmsgs_in_queue) == FAILURE) { return; } @@ -322,7 +321,7 @@ PHP_FUNCTION(curl_multi_close) zval *z_mh; php_curlm *mh; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_mh) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_mh) == FAILURE) { return; } @@ -332,7 +331,7 @@ PHP_FUNCTION(curl_multi_close) } /* }}} */ -void _php_curl_multi_close(zend_resource *rsrc TSRMLS_DC) /* {{{ */ +void _php_curl_multi_close(zend_resource *rsrc) /* {{{ */ { php_curlm *mh = (php_curlm *)rsrc->ptr; if (mh) { @@ -343,8 +342,8 @@ void _php_curl_multi_close(zend_resource *rsrc TSRMLS_DC) /* {{{ */ for (pz_ch = (zval *)zend_llist_get_first_ex(&mh->easyh, &pos); pz_ch; pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) { - ch = (php_curl *) zend_fetch_resource(pz_ch TSRMLS_CC, -1, le_curl_name, NULL, 1, le_curl); - _php_curl_verify_handlers(ch, 0 TSRMLS_CC); + ch = (php_curl *) zend_fetch_resource(pz_ch, -1, le_curl_name, NULL, 1, le_curl); + _php_curl_verify_handlers(ch, 0); } curl_multi_cleanup(mh->multi); @@ -363,7 +362,7 @@ PHP_FUNCTION(curl_multi_strerror) zend_long code; const char *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code) == FAILURE) { return; } @@ -378,7 +377,7 @@ PHP_FUNCTION(curl_multi_strerror) #endif #if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */ -static int _php_curl_multi_setopt(php_curlm *mh, zend_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) /* {{{ */ { CURLMcode error = CURLM_OK; @@ -394,7 +393,7 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue, break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl multi configuration option"); + php_error_docref(NULL, E_WARNING, "Invalid curl multi configuration option"); error = CURLM_UNKNOWN_OPTION; break; } @@ -415,13 +414,13 @@ PHP_FUNCTION(curl_multi_setopt) zend_long options; php_curlm *mh; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_mh, &options, &zvalue) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &z_mh, &options, &zvalue) == FAILURE) { return; } ZEND_FETCH_RESOURCE(mh, php_curlm *, z_mh, -1, le_curl_multi_handle_name, le_curl_multi_handle); - if (!_php_curl_multi_setopt(mh, options, zvalue, return_value TSRMLS_CC)) { + if (!_php_curl_multi_setopt(mh, options, zvalue, return_value)) { RETURN_TRUE; } else { RETURN_FALSE; |