iliaa Tue Jul 4 20:12:38 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
Eliminate some compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.5&r2=1.62.2.14.2.6&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.5
php-src/ext/curl/interface.c:1.62.2.14.2.6
--- php-src/ext/curl/interface.c:1.62.2.14.2.5 Thu Jun 29 14:31:56 2006
+++ php-src/ext/curl/interface.c Tue Jul 4 20:12:38 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.5 2006/06/29 14:31:56 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.6 2006/07/04 20:12:38 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1268,11 +1268,13 @@
ZEND_VERIFY_RESOURCE(what);
if (FAILURE == php_stream_cast((php_stream *) what,
PHP_STREAM_AS_STDIO, (void *) &fp, REPORT_ERRORS)) {
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
if (!fp) {
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
error = CURLE_OK;
@@ -1367,7 +1369,8 @@
postfields = HASH_OF(*zvalue);
if (! postfields) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Couldn't get HashTable in CURLOPT_POSTFIELDS");
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
for
(zend_hash_internal_pointer_reset(postfields);
@@ -1389,7 +1392,8 @@
++postval;
/* safe_mode / open_basedir
check */
if
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) &&
!php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
@@ -1408,7 +1412,8 @@
SAVE_CURL_ERROR(ch, error);
if (error != CURLE_OK) {
- RETURN_FALSE;
+ RETVAL_FALSE
+ return 1;
}
zend_llist_add_element(&ch->to_free.post,
&first);
@@ -1436,7 +1441,8 @@
ph = HASH_OF(*zvalue);
if (!ph) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"You must pass either an object or an array with the CURLOPT_HTTPHEADER,
CURLOPT_QUOTE, CURLOPT_HTTP200ALIASES and CURLOPT_POSTQUOTE arguments");
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
for (zend_hash_internal_pointer_reset(ph);
@@ -1453,7 +1459,8 @@
if (!slist) {
efree(indiv);
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Could not build curl_slist");
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
zend_llist_add_element(&ch->to_free.str,
&indiv);
}
@@ -1475,7 +1482,8 @@
convert_to_string_ex(zvalue);
if (php_check_open_basedir(Z_STRVAL_PP(zvalue)
TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+",
CHECKUID_CHECK_MODE_PARAM))) {
- RETURN_FALSE;
+ RETVAL_FALSE;
+ return 1;
}
copystr = estrndup(Z_STRVAL_PP(zvalue),
Z_STRLEN_PP(zvalue));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
