Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* dlfcn/dlerror.c (dlerror): Always create output string which
	includes object file name.
  • Loading branch information
Ulrich Drepper committed Dec 28, 2000
1 parent bb548f6 commit 9c99fa3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2000-12-27 Ulrich Drepper <drepper@redhat.com>

* dlfcn/dlerror.c (dlerror): Always create output string which
includes object file name.

* sysdeps/alpha/alphaev6/memcpy.S: Don't go through unrolled loop
if we would go through it only once.
Patch by Rick Gorton <rick.gorton@api-networks.com>.
Expand Down
7 changes: 3 additions & 4 deletions dlfcn/dlerror.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ dlerror (void)
else
{
buf = (char *) result->errstring;
if (result->errcode != 0
&& __asprintf (&buf, "%s: %s: %s",
result->objname, _(result->errstring),
strerror (result->errcode)) != -1)
if (__asprintf (&buf, result->errcode != 0 ? "%s: %s: %s" : "%s: %s",
result->objname, _(result->errstring),
strerror (result->errcode)) != -1)
{
/* We don't need the error string anymore. */
if (strcmp (result->errstring, "out of memory") != 0)
Expand Down

0 comments on commit 9c99fa3

Please sign in to comment.