diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-04-15 13:29:26 +0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-05-09 10:03:50 -0300 |
| commit | 59c0f6ff86c0801fbac82a585629793a3920cc83 (patch) | |
| tree | 0a5b2147fde0989b565a07d96d5d2ffec4b9d46d /stdlib | |
| parent | 94dc51ad841ba5a019680f7fd48decf7f23e964e (diff) | |
| download | glibc-release/2.21/master.zip glibc-release/2.21/master.tar.gz glibc-release/2.21/master.tar.bz2 | |
Suppress GCC 6 warning about ambiguous 'else' with -Wparenthesesrelease/2.21/master
Backport of df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.
* stdlib/setenv.c (unsetenv): Fix ambiguous 'else'.
* nis/nis_call.c (nis_server_cache_add): Likewise.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/setenv.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/stdlib/setenv.c b/stdlib/setenv.c index b60c4f0..84cec79 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -269,18 +269,20 @@ unsetenv (name) ep = __environ; if (ep != NULL) while (*ep != NULL) - if (!strncmp (*ep, name, len) && (*ep)[len] == '=') - { - /* Found it. Remove this pointer by moving later ones back. */ - char **dp = ep; - - do - dp[0] = dp[1]; - while (*dp++); - /* Continue the loop in case NAME appears again. */ - } - else - ++ep; + { + if (!strncmp (*ep, name, len) && (*ep)[len] == '=') + { + /* Found it. Remove this pointer by moving later ones back. */ + char **dp = ep; + + do + dp[0] = dp[1]; + while (*dp++); + /* Continue the loop in case NAME appears again. */ + } + else + ++ep; + } UNLOCK; |