From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 18 Aug 1999 23:21:04 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~26859
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96ff49374e18f70784697f776160088474780c61;p=external%2Fglibc.git

Update.

	* sysdeps/generic/setenv.c: Avoid warning about uninitialized variable.
---

diff --git a/ChangeLog b/ChangeLog
index caa5a5a..69294b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-08-18  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/generic/setenv.c: Avoid warning about uninitialized variable.
+
 	* libio/fileops.c (_IO_file_xsgetn): Allocate buffer if none is
 	allocated so far.  [PR libc/1261].
 
diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c
index fc58e9b..387152d 100644
--- a/sysdeps/generic/setenv.c
+++ b/sysdeps/generic/setenv.c
@@ -113,7 +113,7 @@ __add_to_environ (name, value, combined, replace)
      const char *combined;
      int replace;
 {
-  register char **ep;
+  register char **ep = __environ;
   register size_t size;
   const size_t namelen = strlen (name);
   const size_t vallen = value != NULL ? strlen (value) + 1 : 0;
@@ -121,16 +121,16 @@ __add_to_environ (name, value, combined, replace)
   LOCK;
 
   size = 0;
-  if (__environ != NULL)
+  if (ep != NULL)
     {
-      for (ep = __environ; *ep != NULL; ++ep)
+      for (; *ep != NULL; ++ep)
 	if (!strncmp (*ep, name, namelen) && (*ep)[namelen] == '=')
 	  break;
 	else
 	  ++size;
     }
 
-  if (__environ == NULL || *ep == NULL)
+  if (ep == NULL || *ep == NULL)
     {
       char **new_environ;
 #ifdef USE_TSEARCH