From a5eeecb13f8683eaadb137aee33ac2dd292bf1fc Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Mon, 16 May 2011 17:22:41 +0000 Subject: [PATCH] Suppress a dozen unused return value warnings in places where the return value is really not useful to us. --- Zend/zend_language_scanner.c | 6 +++--- Zend/zend_language_scanner.l | 4 ++-- Zend/zend_language_scanner_defs.h | 2 +- ext/standard/exec.c | 2 +- ext/standard/file.c | 12 ++++++------ ext/standard/proc_open.c | 2 +- ext/standard/string.c | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 5db41d7eed..6eeeaddcc5 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun May 8 16:20:00 2011 */ +/* Generated by re2c 0.13.5 on Mon May 16 10:21:08 2011 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -4148,9 +4148,9 @@ yy316: if (strcmp(dirname, ".") == 0) { dirname = erealloc(dirname, MAXPATHLEN); #if HAVE_GETCWD - VCWD_GETCWD(dirname, MAXPATHLEN); + php_ignore_value(VCWD_GETCWD(dirname, MAXPATHLEN)); #elif HAVE_GETWD - VCWD_GETWD(dirname); + php_ignore_value(VCWD_GETWD(dirname)); #endif } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 1e7f92d285..36ba3b2f8b 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1614,9 +1614,9 @@ NEWLINE ("\r"|"\n"|"\r\n") if (strcmp(dirname, ".") == 0) { dirname = erealloc(dirname, MAXPATHLEN); #if HAVE_GETCWD - VCWD_GETCWD(dirname, MAXPATHLEN); + php_ignore_value(VCWD_GETCWD(dirname, MAXPATHLEN)); #elif HAVE_GETWD - VCWD_GETWD(dirname); + php_ignore_value(VCWD_GETWD(dirname)); #endif } diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 8ad31d30b7..0f85cd820b 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun May 8 16:20:00 2011 */ +/* Generated by re2c 0.13.5 on Mon May 16 10:21:08 2011 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE { diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 11b7c2c5e6..890f73726b 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -484,7 +484,7 @@ PHP_FUNCTION(proc_nice) } errno = 0; - nice(pri); + php_ignore_value(nice(pri)); if (errno) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process"); RETURN_FALSE; diff --git a/ext/standard/file.c b/ext/standard/file.c index c6b585c2c7..527f12df61 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1808,7 +1808,7 @@ static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t le case -2: case -1: inc_len = 1; - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); break; case 0: goto quit_loop; @@ -2072,7 +2072,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char zend_bool first_field = 1; /* initialize internal state */ - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); /* Now into new section that parses buf for delimiter/enclosure fields */ @@ -2105,7 +2105,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char case -2: case -1: inc_len = 1; - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); break; case 0: goto quit_loop_1; @@ -2199,7 +2199,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char case -2: case -1: - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); /* break is omitted intentionally */ case 1: /* we need to determine if the enclosure is @@ -2267,7 +2267,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char case -2: case -1: inc_len = 1; - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); /* break is omitted intentionally */ case 1: if (*bptr == delimiter) { @@ -2298,7 +2298,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char case -2: case -1: inc_len = 1; - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); /* break is omitted intentionally */ case 1: if (*bptr == delimiter) { diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 8240bed205..9544cc03da 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -843,7 +843,7 @@ PHP_FUNCTION(proc_open) #endif if (cwd) { - chdir(cwd); + php_ignore_value(chdir(cwd)); } if (env.envarray) { diff --git a/ext/standard/string.c b/ext/standard/string.c index 7dde105247..7cd986c51e 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1354,7 +1354,7 @@ PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char case -2: case -1: inc_len = 1; - php_mblen(NULL, 0); + php_ignore_value(php_mblen(NULL, 0)); break; case 0: goto quit_loop; -- 2.40.0