X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libiberty%2Fsetenv.c;h=2ceabe1317e85beb555cea92e6551d59ff67bbe1;hb=ddf5db90a175756b3a5c39ee87d549d9f9d09d28;hp=35f2a314e87ddf7199549f91d5eb2e8c842334e0;hpb=1e45deed6a87c05c9e669e3cdfdda47cbfa9531d;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 35f2a314e8..2ceabe1317 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2019 Free Software Foundation, Inc.
    This file based on setenv.c in the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -13,13 +13,14 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 
 /*
 
-@deftypefn Supplemental int setenv (const char *@var{name}, const char *@var{value}, int @var{overwrite})
+@deftypefn Supplemental int setenv (const char *@var{name}, @
+  const char *@var{value}, int @var{overwrite})
 @deftypefnx Supplemental void unsetenv (const char *@var{name})
 
 @code{setenv} adds @var{name} to the environment with value
@@ -60,9 +61,7 @@ extern int errno;
 #endif
 
 #define __environ	environ
-#ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-#endif
+#include "environ.h"
 
 #undef setenv
 #undef unsetenv
@@ -115,7 +114,7 @@ setenv (const char *name, const char *value, int replace)
 	  return -1;
 	}
 
-      new_environ[size] = malloc (namelen + 1 + vallen);
+      new_environ[size] = (char *) malloc (namelen + 1 + vallen);
       if (new_environ[size] == NULL)
 	{
 	  free ((char *) new_environ);
@@ -142,13 +141,13 @@ setenv (const char *name, const char *value, int replace)
       if (len + 1 < namelen + 1 + vallen)
 	{
 	  /* The existing string is too short; malloc a new one.  */
-	  char *new = malloc (namelen + 1 + vallen);
-	  if (new == NULL)
+	  char *new_string = (char *) malloc (namelen + 1 + vallen);
+	  if (new_string == NULL)
 	    {
 	      UNLOCK;
 	      return -1;
 	    }
-	  *ep = new;
+	  *ep = new_string;
 	}
       memcpy (*ep, name, namelen);
       (*ep)[namelen] = '=';