about summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2016-04-15 13:29:26 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-04-15 13:30:55 +0200
commitdf1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c (patch)
treeb4c34e6973303c9e4b9a2ac4ae36ee9e4ad22abf /stdlib
parentf8da6e93a616fddaabf8a3e4bc965ceadc426f78 (diff)
downloadglibc-df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.tar.gz
glibc-df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.tar.xz
glibc-df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c.zip
Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/setenv.c26
1 files changed, 14 insertions, 12 deletions
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;