cvs: php4 /ext/curl curl.c php_curl.h
| From: | Sterling Hughes | Date: | Fri, 18 Aug 2000 13:24:00 +0000 |
| Subject: | cvs: php4 /ext/curl curl.c php_curl.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1218@lists.php.net to get a copy of this message | ||
sterling Fri Aug 18 06:24:00 2000 EDT
Modified files:
/php4/ext/curl curl.c php_curl.h
Log:
Purely cosmetic.
Index: php4/ext/curl/curl.c
diff -u php4/ext/curl/curl.c:1.9 php4/ext/curl/curl.c:1.10
--- php4/ext/curl/curl.c:1.9 Wed Aug 16 21:05:57 2000
+++ php4/ext/curl/curl.c Fri Aug 18 06:24:00 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.9 2000/08/17 04:05:57 andi Exp $ */
+/* $Id: curl.c,v 1.10 2000/08/18 13:24:00 sterling Exp $ */
#include "php.h"
@@ -312,15 +312,17 @@
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 @@
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 @@
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: php4/ext/curl/php_curl.h
diff -u php4/ext/curl/php_curl.h:1.7 php4/ext/curl/php_curl.h:1.8
--- php4/ext/curl/php_curl.h:1.7 Wed Aug 16 19:14:41 2000
+++ php4/ext/curl/php_curl.h Fri Aug 18 06:24:00 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_curl.h,v 1.7 2000/08/17 02:14:41 sterling Exp $ */
+/* $Id: php_curl.h,v 1.8 2000/08/18 13:24:00 sterling Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -87,16 +87,15 @@
#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