# HG changeset patch
# User Eric Blake <eblake@redhat.com>
# Date 1363004141 21600
# Node ID a154fccd3b216b377750bf94ba28e523b5dceaaa
# Parent  c332767f3c68c9eb0a0c33f2a58b4ac6f2ca9374
putenv: avoid compilation warning on mingw

On mingw, I got:

../../tests/putenv.c: In function '_unsetenv':
../../tests/putenv.c:65:10: warning: unused variable 'ep'

* lib/putenv.c (_unsetenv): Protect variable declaration.
(putenv): Fix indentation.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff -r c332767f3c68 -r a154fccd3b21 ChangeLog
--- a/ChangeLog	Mon Mar 11 12:48:58 2013 +0700
+++ b/ChangeLog	Mon Mar 11 06:15:41 2013 -0600
@@ -1,3 +1,9 @@
+2013-03-11  Eric Blake  <eblake@redhat.com>
+
+	putenv: avoid compilation warning on mingw
+	* lib/putenv.c (_unsetenv): Protect variable declaration.
+	(putenv): Fix indentation.
+
 2013-03-11  Gary V. Vaughan  <gary@gnu.org>
 
 	unistd: don't prevent Tru64 Unix from using gnulib strtod.
diff -r c332767f3c68 -r a154fccd3b21 lib/putenv.c
--- a/lib/putenv.c	Mon Mar 11 12:48:58 2013 +0700
+++ b/lib/putenv.c	Mon Mar 11 06:15:41 2013 -0600
@@ -62,7 +62,9 @@
 _unsetenv (const char *name)
 {
   size_t len;
+#if !HAVE__PUTENV
   char **ep;
+#endif
 
   if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
     {
@@ -126,45 +128,45 @@
     }
 
 #if HAVE__PUTENV
-      /* Rely on _putenv to allocate the new environment.  If other
-         parts of the application use _putenv, the !HAVE__PUTENV code
-         would fight over who owns the environ vector, causing a crash.  */
-      if (name_end[1])
-        return _putenv (string);
-      else
+  /* Rely on _putenv to allocate the new environment.  If other
+     parts of the application use _putenv, the !HAVE__PUTENV code
+     would fight over who owns the environ vector, causing a crash.  */
+  if (name_end[1])
+    return _putenv (string);
+  else
+    {
+      /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ")
+         to allocate the environ vector and then replace the new
+         entry with "NAME=".  */
+      int putenv_result, putenv_errno;
+      char *name_x = malloc (name_end - string + sizeof "= ");
+      if (!name_x)
+        return -1;
+      memcpy (name_x, string, name_end - string + 1);
+      name_x[name_end - string + 1] = ' ';
+      name_x[name_end - string + 2] = 0;
+      putenv_result = _putenv (name_x);
+      putenv_errno = errno;
+      for (ep = environ; *ep; ep++)
+        if (strcmp (*ep, name_x) == 0)
+          {
+            *ep = string;
+            break;
+          }
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+      if (putenv_result == 0)
         {
-          /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ")
-             to allocate the environ vector and then replace the new
-             entry with "NAME=".  */
-          int putenv_result, putenv_errno;
-          char *name_x = malloc (name_end - string + sizeof "= ");
-          if (!name_x)
-            return -1;
-          memcpy (name_x, string, name_end - string + 1);
-          name_x[name_end - string + 1] = ' ';
-          name_x[name_end - string + 2] = 0;
-          putenv_result = _putenv (name_x);
-          putenv_errno = errno;
-          for (ep = environ; *ep; ep++)
-            if (strcmp (*ep, name_x) == 0)
-              {
-                *ep = string;
-                break;
-              }
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-          if (putenv_result == 0)
-            {
-              /* _putenv propagated "NAME= " into the subprocess environment;
-                 fix that by calling SetEnvironmentVariable directly.  */
-              name_x[name_end - string] = 0;
-              putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1;
-              putenv_errno = ENOMEM; /* ENOMEM is the only way to fail.  */
-            }
+          /* _putenv propagated "NAME= " into the subprocess environment;
+             fix that by calling SetEnvironmentVariable directly.  */
+          name_x[name_end - string] = 0;
+          putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1;
+          putenv_errno = ENOMEM; /* ENOMEM is the only way to fail.  */
+        }
 # endif
-          free (name_x);
-          __set_errno (putenv_errno);
-          return putenv_result;
-        }
+      free (name_x);
+      __set_errno (putenv_errno);
+      return putenv_result;
+    }
 #else
   for (ep = environ; *ep; ep++)
     if (strncmp (*ep, string, name_end - string) == 0