indeyets Sat Jun 21 21:51:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
updated to the new parameter-parsing api
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.9&r2=1.62.2.14.2.27.2.10&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.9
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.10
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.9 Thu Feb 7 02:08:45 2008
+++ php-src/ext/curl/interface.c Sat Jun 21 21:51:05 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.9 2008/02/07 02:08:45 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.10 2008/06/21 21:51:05 indeyets Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1149,15 +1149,15 @@
Copy a cURL handle along with all of it's preferences */
PHP_FUNCTION(curl_copy_handle)
{
- zval **zid;
+ zval *zid;
CURL *cp;
php_curl *ch;
php_curl *dupch;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) ==
FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
cp = curl_easy_duphandle(ch->cp);
if (!cp) {
@@ -1609,18 +1609,17 @@
Set an option for a cURL transfer */
PHP_FUNCTION(curl_setopt)
{
- zval **zid, **zoption, **zvalue;
+ zval *zid, *zvalue;
+ long zoption;
php_curl *ch;
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &zid, &zoption,
&zvalue) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zid,
&zoption, &zvalue) == FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
-
- convert_to_long_ex(zoption);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
- if (!_php_curl_setopt(ch, Z_LVAL_PP(zoption), zvalue, return_value
TSRMLS_CC)) {
+ if (!_php_curl_setopt(ch, zoption, &zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {
RETURN_FALSE;
@@ -1637,7 +1636,7 @@
long option;
HashPosition pos;
char *string_key;
- int str_key_len;
+ uint str_key_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za", &zid, &arr)
== FAILURE) {
RETURN_FALSE;
@@ -1681,15 +1680,15 @@
Perform a cURL session */
PHP_FUNCTION(curl_exec)
{
- zval **zid;
+ zval *zid;
php_curl *ch;
CURLcode error;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) ==
FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
_php_curl_cleanup_handle(ch);
@@ -1723,16 +1722,16 @@
Get information regarding a specific transfer */
PHP_FUNCTION(curl_getinfo)
{
- zval **zid,
- **zoption;
+ zval *zid;
php_curl *ch;
- int option, argc = ZEND_NUM_ARGS();
+ int argc = ZEND_NUM_ARGS();
+ long option;
- if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &zid,
&zoption) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &zid, &option) ==
FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
if (argc < 2) {
char *s_code;
@@ -1807,7 +1806,6 @@
CAAS("request_header", ch->header.str);
}
} else {
- option = Z_LVAL_PP(zoption);
switch (option) {
case CURLINFO_PRIVATE:
case CURLINFO_EFFECTIVE_URL:
@@ -1872,14 +1870,14 @@
Return a string contain the last error for the current session */
PHP_FUNCTION(curl_error)
{
- zval **zid;
+ zval *zid;
php_curl *ch;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) ==
FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
ch->err.str[CURL_ERROR_SIZE] = 0;
RETURN_STRING(ch->err.str, 1);
@@ -1890,14 +1888,14 @@
Return an integer containing the last error number */
PHP_FUNCTION(curl_errno)
{
- zval **zid;
+ zval *zid;
php_curl *ch;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) ==
FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
RETURN_LONG(ch->err.no);
}
@@ -1907,14 +1905,14 @@
Close a cURL session */
PHP_FUNCTION(curl_close)
{
- zval **zid;
+ zval *zid;
php_curl *ch;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) ==
FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+ ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
if (ch->in_callback) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close
cURL handle from a callback");
@@ -1924,7 +1922,7 @@
if (ch->uses) {
ch->uses--;
} else {
- zend_list_delete(Z_LVAL_PP(zid));
+ zend_list_delete(Z_LVAL_P(zid));
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
