rasmus Mon, 16 May 2011 17:22:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311100
Log:
Suppress a dozen unused return value warnings in places where the return
value is really not useful to us.
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c
U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l
U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h
U php/php-src/branches/PHP_5_4/ext/standard/exec.c
U php/php-src/branches/PHP_5_4/ext/standard/file.c
U php/php-src/branches/PHP_5_4/ext/standard/proc_open.c
U php/php-src/branches/PHP_5_4/ext/standard/string.c
U php/php-src/trunk/Zend/zend_language_scanner.l
U php/php-src/trunk/ext/standard/exec.c
U php/php-src/trunk/ext/standard/file.c
U php/php-src/trunk/ext/standard/proc_open.c
U php/php-src/trunk/ext/standard/string.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -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 @@
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
}
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l 2011-05-16 17:22:41 UTC (rev 311100)
@@ -1614,9 +1614,9 @@
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
}
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h 2011-05-16 17:22:41 UTC (rev 311100)
@@ -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 {
Modified: php/php-src/branches/PHP_5_4/ext/standard/exec.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/exec.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/ext/standard/exec.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -484,7 +484,7 @@
}
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;
Modified: php/php-src/branches/PHP_5_4/ext/standard/file.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/file.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/ext/standard/file.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -1808,7 +1808,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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) {
Modified: php/php-src/branches/PHP_5_4/ext/standard/proc_open.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/proc_open.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/ext/standard/proc_open.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -843,7 +843,7 @@
#endif
if (cwd) {
- chdir(cwd);
+ php_ignore_value(chdir(cwd));
}
if (env.envarray) {
Modified: php/php-src/branches/PHP_5_4/ext/standard/string.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/string.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/branches/PHP_5_4/ext/standard/string.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -1354,7 +1354,7 @@
case -2:
case -1:
inc_len = 1;
- php_mblen(NULL, 0);
+ php_ignore_value(php_mblen(NULL, 0));
break;
case 0:
goto quit_loop;
Modified: php/php-src/trunk/Zend/zend_language_scanner.l
===================================================================
--- php/php-src/trunk/Zend/zend_language_scanner.l 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/trunk/Zend/zend_language_scanner.l 2011-05-16 17:22:41 UTC (rev 311100)
@@ -1614,9 +1614,9 @@
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
}
Modified: php/php-src/trunk/ext/standard/exec.c
===================================================================
--- php/php-src/trunk/ext/standard/exec.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/trunk/ext/standard/exec.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -484,7 +484,7 @@
}
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;
Modified: php/php-src/trunk/ext/standard/file.c
===================================================================
--- php/php-src/trunk/ext/standard/file.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/trunk/ext/standard/file.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -1808,7 +1808,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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) {
Modified: php/php-src/trunk/ext/standard/proc_open.c
===================================================================
--- php/php-src/trunk/ext/standard/proc_open.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/trunk/ext/standard/proc_open.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -843,7 +843,7 @@
#endif
if (cwd) {
- chdir(cwd);
+ php_ignore_value(chdir(cwd));
}
if (env.envarray) {
Modified: php/php-src/trunk/ext/standard/string.c
===================================================================
--- php/php-src/trunk/ext/standard/string.c 2011-05-16 16:58:02 UTC (rev 311099)
+++ php/php-src/trunk/ext/standard/string.c 2011-05-16 17:22:41 UTC (rev 311100)
@@ -1354,7 +1354,7 @@
case -2:
case -1:
inc_len = 1;
- php_mblen(NULL, 0);
+ php_ignore_value(php_mblen(NULL, 0));
break;
case 0:
goto quit_loop;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
