* dlfcn/dlerror.c (dlerror): Always create output string which
	includes object file name.
This commit is contained in:
Ulrich Drepper 2000-12-28 00:48:48 +00:00
parent bb548f63d5
commit 9c99fa3d31
2 changed files with 6 additions and 4 deletions

View File

@ -1,5 +1,8 @@
2000-12-27 Ulrich Drepper <drepper@redhat.com> 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 * sysdeps/alpha/alphaev6/memcpy.S: Don't go through unrolled loop
if we would go through it only once. if we would go through it only once.
Patch by Rick Gorton <rick.gorton@api-networks.com>. Patch by Rick Gorton <rick.gorton@api-networks.com>.

View File

@ -69,10 +69,9 @@ dlerror (void)
else else
{ {
buf = (char *) result->errstring; buf = (char *) result->errstring;
if (result->errcode != 0 if (__asprintf (&buf, result->errcode != 0 ? "%s: %s: %s" : "%s: %s",
&& __asprintf (&buf, "%s: %s: %s", result->objname, _(result->errstring),
result->objname, _(result->errstring), strerror (result->errcode)) != -1)
strerror (result->errcode)) != -1)
{ {
/* We don't need the error string anymore. */ /* We don't need the error string anymore. */
if (strcmp (result->errstring, "out of memory") != 0) if (strcmp (result->errstring, "out of memory") != 0)