Update.

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

diff --git a/ChangeLog b/ChangeLog
index be43d48ecc8a78fb5e688709679de3bb0973a3b2..4ae2e2f03e9e5fc447267c93682c92d429063a8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>.

diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index 929b5f439ba210d1c5ab1c508928df2ad84dd8f5..6ce601d05b90754a3304680b11ae58eb22291021 100644 (file)
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -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)