Re: cvs: php-src /ext/curl interface.c

Can't you do it all in one commit? Now you've littered the log with these half-assed commits, and STILL didn't do everything..there are several "RETURN_FALSE;"'s there where simple "return" is necessary. --Jani Pierre-Alain Joye wrote:

pajoye Mon May 18 12:03:05 2009 UTC

  Modified files:                  /php-src/ext/curl	interface.c   Log:

- sync with 5.3 http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.160&r2=1.161&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.160 php-src/ext/curl/interface.c:1.161 --- php-src/ext/curl/interface.c:1.160 Mon May 18 11:50:29 2009 +++ php-src/ext/curl/interface.c Mon May 18 12:03:05 2009 @@ -16,7 +16,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: interface.c,v 1.160 2009/05/18 11:50:29 pajoye Exp $ */ +/* $Id: interface.c,v 1.161 2009/05/18 12:03:05 pajoye Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1298,8 +1298,7 @@ array_init(protocol_list); while (*p != NULL) { - add_next_index_ascii_string(protocol_list, *p, 1); - *p++; + add_next_index_ascii_string(protocol_list, *p++, 1); } CAAZ("protocols", protocol_list); } @@ -1411,7 +1410,7 @@ php_curl *ch, *dupch; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zid) == FAILURE) { - RETURN_FALSE; + return; } ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);