diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-09-04 07:50:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-09-04 07:50:46 +0000 |
| commit | 903244ac3c697bc1f05c0ec0b994d7c36763ca3f (patch) | |
| tree | 28074822420af826680c42672e59a0ae52617f27 /elf/dl-object.c | |
| parent | 0668d223a5d7b629be65c85a710aaea953e545ca (diff) | |
| download | glibc-903244ac3c697bc1f05c0ec0b994d7c36763ca3f.tar glibc-903244ac3c697bc1f05c0ec0b994d7c36763ca3f.tar.gz glibc-903244ac3c697bc1f05c0ec0b994d7c36763ca3f.tar.bz2 glibc-903244ac3c697bc1f05c0ec0b994d7c36763ca3f.zip | |
Update.
2001-09-04 Ulrich Drepper <drepper@redhat.com>
* elf/dl-object.c (_dl_new_object): Remove unnecessary if.
Diffstat (limited to 'elf/dl-object.c')
| -rw-r--r-- | elf/dl-object.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/elf/dl-object.c b/elf/dl-object.c index c7b67e94d1..07e428e8e6 100644 --- a/elf/dl-object.c +++ b/elf/dl-object.c @@ -91,7 +91,7 @@ _dl_new_object (char *realname, const char *libname, int type, /* It an absolute path. Use it. But we have to make a copy since we strip out the trailing slash. */ size_t len = strlen (realname) + 1; - origin = malloc (len); + origin = (char *) malloc (len); if (origin == NULL) origin = (char *) -1; else @@ -104,7 +104,7 @@ _dl_new_object (char *realname, const char *libname, int type, char *result = NULL; /* Get the current directory name. */ - origin = malloc (len); + origin = (char *) malloc (len); while (origin != NULL && (result = __getcwd (origin, len - realname_len)) == NULL @@ -117,8 +117,7 @@ _dl_new_object (char *realname, const char *libname, int type, if (result == NULL) { /* We were not able to determine the current directory. */ - if (origin != NULL) - free (origin); + free (origin); origin = (char *) -1; } else |