diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-04-15 13:29:26 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-04-15 13:30:55 +0200 |
| commit | df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c (patch) | |
| tree | b4c34e6973303c9e4b9a2ac4ae36ee9e4ad22abf | |
| parent | f8da6e93a616fddaabf8a3e4bc965ceadc426f78 (diff) | |
| download | glibc-df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.tar.gz glibc-df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.tar.xz glibc-df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.zip | |
Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nis/nis_call.c | 20 | ||||
| -rw-r--r-- | stdlib/setenv.c | 26 |
3 files changed, 30 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 5d6b787329..ce223579d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-04-15 Yvan Roux <yvan.roux@linaro.org> + + * stdlib/setenv.c (unsetenv): Fix ambiguous 'else'. + * nis/nis_call.c (nis_server_cache_add): Likewise. + 2016-04-14 Adhemerval Zanella <adhemerval.zanella@linaro.org> * sysdeps/unix/sysv/linux/sysdep.h: Include kernel-features.h. diff --git a/nis/nis_call.c b/nis/nis_call.c index 3fa37e45a3..cb7839a6f8 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent, /* Choose which entry should be evicted from the cache. */ loc = &nis_server_cache[0]; if (*loc != NULL) - for (i = 1; i < 16; ++i) - if (nis_server_cache[i] == NULL) - { + { + for (i = 1; i < 16; ++i) + if (nis_server_cache[i] == NULL) + { + loc = &nis_server_cache[i]; + break; + } + else if ((*loc)->uses > nis_server_cache[i]->uses + || ((*loc)->uses == nis_server_cache[i]->uses + && (*loc)->expires > nis_server_cache[i]->expires)) loc = &nis_server_cache[i]; - break; - } - else if ((*loc)->uses > nis_server_cache[i]->uses - || ((*loc)->uses == nis_server_cache[i]->uses - && (*loc)->expires > nis_server_cache[i]->expires)) - loc = &nis_server_cache[i]; + } old = *loc; *loc = new; diff --git a/stdlib/setenv.c b/stdlib/setenv.c index da61ee0720..e66045f7d8 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -278,18 +278,20 @@ unsetenv (const char *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; |