From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 4 Jul 2006 20:12:38 +0000 (+0000)
Subject: Eliminate some compiler warnings
X-Git-Tag: php-5.2.0RC1~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0178f71ee90fa6c0a0df6a29e87417879ec0cd1;p=php

Eliminate some compiler warnings
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 1ce0e36a77..dc1efe8021 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1268,11 +1268,13 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 			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 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 				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 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 						++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 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 
 				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 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 			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 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 				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 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 			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));