Refactoring ext/curl (only compilable now)

1 files changed, 29 insertions, 29 deletions

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 96edb9ae03..018add502b 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -114,44 +114,44 @@ PHP_FUNCTION(curl_pause);
 PHP_FUNCTION(curl_file_create);
 
 
-void _php_curl_multi_close(zend_rsrc_list_entry * TSRMLS_DC);
-void _php_curl_share_close(zend_rsrc_list_entry * TSRMLS_DC);
+void _php_curl_multi_close(zend_resource * TSRMLS_DC);
+void _php_curl_share_close(zend_resource * TSRMLS_DC);
 
 typedef struct {
-	zval            *func_name;
-	zend_fcall_info_cache fci_cache;
-	FILE            *fp;
-	smart_str       buf;
-	int             method;
-	zval		*stream;
+	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;
-	long            fd;
-	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;
 
@@ -178,18 +178,18 @@ typedef struct {
 	void ***thread_ctx;
 	CURL                    *cp;
 	php_curl_handlers       *handlers;
-	long                     id;
+	zend_resource           *res;
 	zend_bool                in_callback;
-	zval                     *clone;
+	zval                     clone;
 	zend_bool                safe_upload;
 } 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 {