]> granicus.if.org Git - php/commitdiff
Purely cosmetic.
authorSterling Hughes <sterling@php.net>
Fri, 18 Aug 2000 13:24:00 +0000 (13:24 +0000)
committerSterling Hughes <sterling@php.net>
Fri, 18 Aug 2000 13:24:00 +0000 (13:24 +0000)
ext/curl/curl.c
ext/curl/php_curl.h

index 8e5fdc1b8294837a60e53318dc170cac4f6cb15b..03212b2abda9d23a6a3fd9e7b0fd0e19ae791027 100644 (file)
@@ -312,15 +312,17 @@ PHP_FUNCTION(curl_setopt)
                ret = curl_easy_setopt(cp, option, fp);
                
                if (option == CURLOPT_FILE) {
-                       CURLG(output_node) = &CURLG(output_start);
+                       CURLG(output_node) = &CURLG(output_start);                      
+                       
                        while (CURLG(output_node)->next)
                                CURLG(output_node) = CURLG(output_node)->next;
                        
-                       CURLG(output_node)->next = (struct curl_fileid_table *)emalloc(sizeof(struct curl_fileid_table));
+                       CURLG(output_node)->next = (struct curl_file_id_table *)emalloc(sizeof(struct curl_file_id_table));
                        CURLG(output_node) = CURLG(output_node)->next;
                        CURLG(output_node)->id = Z_LVAL_PP(uCurlId);
                        CURLG(output_node)->next = NULL;
                }
+               
        }
 
        RETURN_LONG(php_curl_error_translator(ret));
@@ -338,7 +340,7 @@ PHP_FUNCTION (curl_exec)
        CURLLS_FETCH();
        
        if (ZEND_NUM_ARGS() != 1 ||
-           zend_get_parameters_ex (1, &uCurlId) == FAILURE) {
+           zend_get_parameters_ex(1, &uCurlId) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
        
@@ -392,12 +394,12 @@ PHP_FUNCTION (curl_close)
        CURLLS_FETCH();
        
        if (ZEND_NUM_ARGS() != 1 ||
-           zend_get_parameters_ex (1, &uCurlId) == FAILURE) {
+           zend_get_parameters_ex(1, &uCurlId) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
        
        ZEND_FETCH_RESOURCE(cp, CURL *, uCurlId, -1, "CURL Handle", CURLG(le_curl));
-       zend_list_delete(Z_LVAL_PP (uCurlId));
+       zend_list_delete(Z_LVAL_PP(uCurlId));
 }
 /* }}} */
 
index 5ad041507b8241425cae336e08479d6e257c926c..42fdde997a7f1358c08760ee85af006a61187feb 100644 (file)
@@ -87,16 +87,15 @@ PHP_FUNCTION(curl_close);
 #define CE_BAD_CALLING_ORDER 44
 #define C_LAST 45
 
-struct curl_fileid_table
-{
+struct curl_file_id_table {
        int id;
-       struct curl_fileid_table *next;
+       struct curl_file_id_table *next;
 };
 
 typedef struct {
        int use_file;
        int le_curl;
-       struct curl_fileid_table *output_node, output_start;
+       struct curl_file_id_table *output_node, output_start;
 } php_curl_globals;
 
 #ifdef ZTS