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 /nis/nis_call.c | |
parent | 94dc51ad841ba5a019680f7fd48decf7f23e964e (diff) | |
download | glibc-59c0f6ff86c0801fbac82a585629793a3920cc83.tar.gz |
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 'nis/nis_call.c')
-rw-r--r-- | nis/nis_call.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/nis/nis_call.c b/nis/nis_call.c index 970415b505..d98c3859f4 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; |