From c80f2bcba2dcac28046d845c30553e51b2926e80 Mon Sep 17 00:00:00 2001 From: Sterling Hughes Date: Fri, 18 Aug 2000 13:24:00 +0000 Subject: [PATCH] Purely cosmetic. --- ext/curl/curl.c | 12 +++++++----- ext/curl/php_curl.h | 7 +++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ext/curl/curl.c b/ext/curl/curl.c index 8e5fdc1b82..03212b2abd 100644 --- a/ext/curl/curl.c +++ b/ext/curl/curl.c @@ -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)); } /* }}} */ diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 5ad041507b..42fdde997a 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -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 -- 2.40.0