diff options
| author | DJ Delorie <dj@redhat.com> | 2005-05-24 21:01:33 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-05-24 21:01:33 +0000 |
| commit | abf6a75b428517d9caaf9155212b0b10e0379a99 (patch) | |
| tree | 3476694dba1d2c731deb2a131b0d8d6c5dcb0cd3 /libiberty/setenv.c | |
| parent | f127898a4db12540b9898e25777c6c3725d119bf (diff) | |
| download | gdb-abf6a75b428517d9caaf9155212b0b10e0379a99.zip gdb-abf6a75b428517d9caaf9155212b0b10e0379a99.tar.gz gdb-abf6a75b428517d9caaf9155212b0b10e0379a99.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/setenv.c')
| -rw-r--r-- | libiberty/setenv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libiberty/setenv.c b/libiberty/setenv.c index fa702c3..355af5a 100644 --- a/libiberty/setenv.c +++ b/libiberty/setenv.c @@ -115,7 +115,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 +142,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] = '='; |