com php-src: Require semicolon after SAVE_CURL_ERROR() : ext/curl/interface.c

From: Date: Mon, 13 May 2019 09:01:37 +0000
Subject: com php-src: Require semicolon after SAVE_CURL_ERROR() : ext/curl/interface.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106156@lists.php.net to get a copy of this message
Commit: 5d3337076b8dc8d4427a5c6259429972eab18db8 Author: GITSRC <34047788+gitsrc@users.noreply.github.com> Mon, 13 May 2019 16:21:46 +0800 Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 13 May 2019 11:01:37 +0200 Parents: c55af3c65ac116bbd935bd3d695869d88056c49c Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5d3337076b8dc8d4427a5c6259429972eab18db8 Log: Require semicolon after SAVE_CURL_ERROR() Changed paths: M ext/curl/interface.c Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 8f695d3..5b6e5f8 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -107,8 +107,8 @@ static ZEND_ATTRIBUTE_UNUSED unsigned long php_curl_ssl_id(void) static void _php_curl_close_ex(php_curl *ch); static void _php_curl_close(zend_resource *rsrc); - -#define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err; +#define SAVE_CURL_ERROR(__handle, __err) \ + do { (__handle)->err.no = (int) __err; } while (0) #define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s) - 1, (zend_long) v); #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s) - 1, (double) v); @@ -147,7 +147,7 @@ static int php_curl_option_str(php_curl *ch, zend_long option, const char *str, } #endif - SAVE_CURL_ERROR(ch, error) + SAVE_CURL_ERROR(ch, error); return error == CURLE_OK ? SUCCESS : FAILURE; }

« previous php.cvs (#106156) next »