Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses

diff --git a/ChangeLog b/ChangeLog
index 5d6b787329720a615148fd8c0834da8023f62d2a..ce223579d229f67497c0ba49d7ca0414b33dbeb7 100644 (file)
--- 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 3fa37e45a3bc1f4b7539cfab8b895dfb25067dad..cb7839a6f8051feccc06fa56239ee48e789ccfcb 100644 (file)
--- 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 da61ee0720c84109ad96a81749494810d5b59183..e66045f7d88870f285a73743fe8438436e4effde 100644 (file)
--- 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;