com php-src: Reorder fields of curl: ext/curl/interface.c ext/curl/php_curl.h
| From: | Xinchen Hui | Date: | Fri, 08 May 2015 05:36:55 +0000 |
| Subject: | com php-src: Reorder fields of curl: ext/curl/interface.c ext/curl/php_curl.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86651@lists.php.net to get a copy of this message | ||
Commit: f05baec0db453d03be15303409341abb53efb9d9
Author: Xinchen Hui <laruence@php.net> Fri, 8 May 2015 13:32:22 +0800
Parents: 0c92538e6f666fda25c3f72445f45923d0f8a4f6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f05baec0db453d03be15303409341abb53efb9d9
Log:
Reorder fields of curl
Changed paths:
M ext/curl/interface.c
M ext/curl/php_curl.h
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index db53824..a9b7edc 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2893,7 +2893,7 @@ PHP_FUNCTION(curl_getinfo)
{
zval *zid;
php_curl *ch;
- zend_long option = 0;
+ zend_long option = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &zid, &option) == FAILURE) {
return;
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index a1ef16f..b3853ef 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -121,40 +121,40 @@ void _php_curl_multi_close(zend_resource *);
void _php_curl_share_close(zend_resource *);
typedef struct {
- zval func_name;
- zend_fcall_info_cache fci_cache;
- FILE *fp;
- smart_str buf;
- int method;
+ zval func_name;
+ zend_fcall_info_cache fci_cache;
+ FILE *fp;
+ smart_str buf;
+ int method;
zval stream;
} php_curl_write;
typedef struct {
- zval func_name;
- zend_fcall_info_cache fci_cache;
- FILE *fp;
- zend_resource *res;
- int method;
- zval stream;
+ zval func_name;
+ zend_fcall_info_cache fci_cache;
+ FILE *fp;
+ zend_resource *res;
+ int method;
+ zval stream;
} php_curl_read;
typedef struct {
- zval func_name;
- zend_fcall_info_cache fci_cache;
- int method;
+ zval func_name;
+ zend_fcall_info_cache fci_cache;
+ int method;
} php_curl_progress, php_curl_fnmatch;
typedef struct {
- php_curl_write *write;
- php_curl_write *write_header;
- php_curl_read *read;
+ php_curl_write *write;
+ php_curl_write *write_header;
+ php_curl_read *read;
#if CURLOPT_PASSWDFUNCTION != 0
- zval passwd;
+ zval passwd;
#endif
- zval std_err;
- php_curl_progress *progress;
+ zval std_err;
+ php_curl_progress *progress;
#if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7..21.0 */
- php_curl_fnmatch *fnmatch;
+ php_curl_fnmatch *fnmatch;
#endif
} php_curl_handlers;
@@ -174,22 +174,22 @@ struct _php_curl_free {
};
typedef struct {
- struct _php_curl_error err;
- struct _php_curl_free *to_free;
+ CURL *cp;
+ php_curl_handlers *handlers;
+ zend_resource *res;
+ struct _php_curl_free *to_free;
struct _php_curl_send_headers header;
- CURL *cp;
- php_curl_handlers *handlers;
- zend_resource *res;
- zend_bool in_callback;
- uint32_t clone;
+ struct _php_curl_error err;
+ zend_bool in_callback;
+ uint32_t clone;
} php_curl;
#define CURLOPT_SAFE_UPLOAD -1
typedef struct {
- int still_running;
- CURLM *multi;
- zend_llist easyh;
+ int still_running;
+ CURLM *multi;
+ zend_llist easyh;
} php_curlm;
typedef struct {