sterling Tue Mar 20 13:30:43 2001 EDT
Modified files:
/php4/ext/curl curl.c
Log:
remove some unneccessary casts, remove unneccessary error casts, standardize
the coding format for some of the stuff.
Index: php4/ext/curl/curl.c
diff -u php4/ext/curl/curl.c:1.40 php4/ext/curl/curl.c:1.41
--- php4/ext/curl/curl.c:1.40 Mon Mar 19 17:46:41 2001
+++ php4/ext/curl/curl.c Tue Mar 20 13:30:42 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.40 2001/03/20 01:46:41 sterling Exp $ */
+/* $Id: curl.c,v 1.41 2001/03/20 21:30:42 sterling Exp $ */
#include "php.h"
@@ -67,20 +67,20 @@
Initialize WSA stuff on Win32 systems */
static CURLcode win32_init()
{
- WORD wVersionRequested;
- WSADATA wsaData;
- int err;
- wVersionRequested = MAKEWORD(1, 1);
-
- err = WSAStartup(wVersionRequested, &wsaData);
-
- if (err != 0) return CURLE_FAILED_INIT;
-
- if (LOBYTE(wsaData.wVersion) != 1 ||
- HIBYTE(wsaData.wVersion) != 1) {
- WSACleanup();
- return CURLE_FAILED_INIT;
+ WSADATA wsa_data;
+ WORD requested_version = MAKEWORD(1, 1);
+ int error;
+
+ error = WSAStartup(requested_version, wsa_data);
+ if (error != 0) {
+ return CURLE_FAILED_INIT;
+ }
+
+ if (LOBYTE(wsa_data.wVersion) != 1 || HIBYTE(wsa_data.wVersion) != 1) {
+ WSACleanup();
+ return CURLE_FAILED_INIT;
}
+
return CURLE_OK;
}
/* }}} */
@@ -124,7 +124,7 @@
PHP_MINFO_FUNCTION(curl)
{
php_info_print_table_start();
- php_info_print_table_row(2, "CURL support", "enabled");
+ php_info_print_table_row(2, "CURL support", "enabled");
php_info_print_table_row(2, "CURL Information", curl_version());
php_info_print_table_end();
}
@@ -205,52 +205,52 @@
#endif
/* Error Constants */
- REGISTER_LONG_CONSTANT("CURLE_OK", (int)CURLE_OK, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_UNSUPPORTED_PROTOCOL",
(int)CURLE_UNSUPPORTED_PROTOCOL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FAILED_INIT", (int)CURLE_FAILED_INIT, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_URL_MALFORMAT", (int)CURLE_URL_MALFORMAT,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_URL_MALFORMAT_USER",
(int)CURLE_URL_MALFORMAT_USER, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_COULDNT_RESOLVE_PROXY",
(int)CURLE_COULDNT_RESOLVE_PROXY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_COULDNT_RESOLVE_HOST",
(int)CURLE_COULDNT_RESOLVE_HOST, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_COULDNT_CONNECT", (int)CURLE_COULDNT_CONNECT,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_SERVER_REPLY",
(int)CURLE_FTP_WEIRD_SERVER_REPLY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_ACCESS_DENIED",
(int)CURLE_FTP_ACCESS_DENIED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_USER_PASSWORD_INCORRECT",
(int)CURLE_FTP_USER_PASSWORD_INCORRECT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_PASS_REPLY",
(int)CURLE_FTP_WEIRD_PASS_REPLY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_USER_REPLY",
(int)CURLE_FTP_WEIRD_USER_REPLY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_PASV_REPLY",
(int)CURLE_FTP_WEIRD_PASV_REPLY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_227_FORMAT",
(int)CURLE_FTP_WEIRD_227_FORMAT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_CANT_GET_HOST",
(int)CURLE_FTP_CANT_GET_HOST, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_CANT_RECONNECT",
(int)CURLE_FTP_CANT_RECONNECT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_SET_BINARY",
(int)CURLE_FTP_COULDNT_SET_BINARY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_PARTIAL_FILE", (int)CURLE_PARTIAL_FILE, CONST_CS
| CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_RETR_FILE",
(int)CURLE_FTP_COULDNT_RETR_FILE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_WRITE_ERROR", (int)CURLE_FTP_WRITE_ERROR,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_QUOTE_ERROR", (int)CURLE_FTP_QUOTE_ERROR,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_HTTP_NOT_FOUND", (int)CURLE_HTTP_NOT_FOUND,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_WRITE_ERROR", (int)CURLE_WRITE_ERROR, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_MALFORMAT_USER", (int)CURLE_MALFORMAT_USER,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_STOR_FILE",
(int)CURLE_FTP_COULDNT_STOR_FILE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_READ_ERROR", (int)CURLE_READ_ERROR, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_OUT_OF_MEMORY", (int)CURLE_OUT_OF_MEMORY,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_OPERATION_TIMEOUTED",
(int)CURLE_OPERATION_TIMEOUTED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_SET_ASCII",
(int)CURLE_FTP_COULDNT_SET_ASCII, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_PORT_FAILED", (int)CURLE_FTP_PORT_FAILED,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_USE_REST",
(int)CURLE_FTP_COULDNT_USE_REST, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_GET_SIZE",
(int)CURLE_FTP_COULDNT_GET_SIZE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_HTTP_RANGE_ERROR", (int)CURLE_HTTP_RANGE_ERROR,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_HTTP_POST_ERROR", (int)CURLE_HTTP_POST_ERROR,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_SSL_CONNECT_ERROR",
(int)CURLE_SSL_CONNECT_ERROR, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FTP_BAD_DOWNLOAD_RESUME",
(int)CURLE_FTP_BAD_DOWNLOAD_RESUME, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FILE_COULDNT_READ_FILE",
(int)CURLE_FILE_COULDNT_READ_FILE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_LDAP_CANNOT_BIND", (int)CURLE_LDAP_CANNOT_BIND,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_LDAP_SEARCH_FAILED",
(int)CURLE_LDAP_SEARCH_FAILED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_LIBRARY_NOT_FOUND",
(int)CURLE_LIBRARY_NOT_FOUND, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_FUNCTION_NOT_FOUND",
(int)CURLE_FUNCTION_NOT_FOUND, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_ABORTED_BY_CALLBACK",
(int)CURLE_ABORTED_BY_CALLBACK, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_BAD_FUNCTION_ARGUMENT",
(int)CURLE_BAD_FUNCTION_ARGUMENT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURLE_BAD_CALLING_ORDER",
(int)CURLE_BAD_CALLING_ORDER, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CURL_LAST", (int)CURL_LAST, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_OK", CURLE_OK, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_UNSUPPORTED_PROTOCOL",
+CURLE_UNSUPPORTED_PROTOCOL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FAILED_INIT", CURLE_FAILED_INIT, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_URL_MALFORMAT", CURLE_URL_MALFORMAT, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_URL_MALFORMAT_USER", CURLE_URL_MALFORMAT_USER,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_COULDNT_RESOLVE_PROXY",
+CURLE_COULDNT_RESOLVE_PROXY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_COULDNT_RESOLVE_HOST",
+CURLE_COULDNT_RESOLVE_HOST, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_COULDNT_CONNECT", CURLE_COULDNT_CONNECT,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_SERVER_REPLY",
+CURLE_FTP_WEIRD_SERVER_REPLY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_ACCESS_DENIED", CURLE_FTP_ACCESS_DENIED,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_USER_PASSWORD_INCORRECT",
+CURLE_FTP_USER_PASSWORD_INCORRECT, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_PASS_REPLY",
+CURLE_FTP_WEIRD_PASS_REPLY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_USER_REPLY",
+CURLE_FTP_WEIRD_USER_REPLY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_PASV_REPLY",
+CURLE_FTP_WEIRD_PASV_REPLY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_WEIRD_227_FORMAT",
+CURLE_FTP_WEIRD_227_FORMAT, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_CANT_GET_HOST", CURLE_FTP_CANT_GET_HOST,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_CANT_RECONNECT", CURLE_FTP_CANT_RECONNECT,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_SET_BINARY",
+CURLE_FTP_COULDNT_SET_BINARY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_PARTIAL_FILE", CURLE_PARTIAL_FILE, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_RETR_FILE",
+CURLE_FTP_COULDNT_RETR_FILE, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_WRITE_ERROR", CURLE_FTP_WRITE_ERROR,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_QUOTE_ERROR", CURLE_FTP_QUOTE_ERROR,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_HTTP_NOT_FOUND", CURLE_HTTP_NOT_FOUND, CONST_CS
+| CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_WRITE_ERROR", CURLE_WRITE_ERROR, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_MALFORMAT_USER", CURLE_MALFORMAT_USER, CONST_CS
+| CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_STOR_FILE",
+CURLE_FTP_COULDNT_STOR_FILE, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_READ_ERROR", CURLE_READ_ERROR, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_OUT_OF_MEMORY", CURLE_OUT_OF_MEMORY, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_OPERATION_TIMEOUTED", CURLE_OPERATION_TIMEOUTED,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_SET_ASCII",
+CURLE_FTP_COULDNT_SET_ASCII, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_PORT_FAILED", CURLE_FTP_PORT_FAILED,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_USE_REST",
+CURLE_FTP_COULDNT_USE_REST, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_COULDNT_GET_SIZE",
+CURLE_FTP_COULDNT_GET_SIZE, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_HTTP_RANGE_ERROR", CURLE_HTTP_RANGE_ERROR,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_HTTP_POST_ERROR", CURLE_HTTP_POST_ERROR,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_SSL_CONNECT_ERROR", CURLE_SSL_CONNECT_ERROR,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FTP_BAD_DOWNLOAD_RESUME",
+CURLE_FTP_BAD_DOWNLOAD_RESUME, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FILE_COULDNT_READ_FILE",
+CURLE_FILE_COULDNT_READ_FILE, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_LDAP_CANNOT_BIND", CURLE_LDAP_CANNOT_BIND,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_LDAP_SEARCH_FAILED", CURLE_LDAP_SEARCH_FAILED,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_LIBRARY_NOT_FOUND", CURLE_LIBRARY_NOT_FOUND,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_FUNCTION_NOT_FOUND", CURLE_FUNCTION_NOT_FOUND,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_ABORTED_BY_CALLBACK", CURLE_ABORTED_BY_CALLBACK,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_BAD_FUNCTION_ARGUMENT",
+CURLE_BAD_FUNCTION_ARGUMENT, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURLE_BAD_CALLING_ORDER", CURLE_BAD_CALLING_ORDER,
+CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CURL_LAST", CURL_LAST, CONST_CS | CONST_PERSISTENT);
if (win32_init() != CURLE_OK) {
return FAILURE;
@@ -429,8 +429,8 @@
convert_to_string_ex(current);
if (zend_hash_get_current_key(u_post,
&string_key, &num_key, 0) == HASH_KEY_IS_LONG) {
- php_error(E_WARNING, "Array passed to
%s() must be an associative array", get_active_function_name());
- RETURN_FALSE;
+ string_key = emalloc(20);
+ sprintf(string_key, "%d", num_key);
}
val_str = estrndup(Z_STRVAL_PP(current),
Z_STRLEN_PP(current));
@@ -440,6 +440,7 @@
ret = curl_formparse(str, &first, &last);
+ efree(string_key);
efree(val_str);
}
@@ -482,8 +483,7 @@
RETURN_FALSE;
}
- header = (struct curl_slist *)emalloc(sizeof(struct
curl_slist));
-
+ header = emalloc(sizeof(struct curl_slist));
memset(header, 0, sizeof(struct curl_slist));
for (zend_hash_internal_pointer_reset(headers);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
