commit 087005f37e02b48809746947159d824493885b1e
author Dmitriy Ivanov <dimitry@google.com> Thu May 28 11:44:31 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu May 28 11:44:31 2015 -0700
tree 86cca9819137291f35c63a668be83774738d1233
parent d717b1a3e55db9b7625a46bec950e856cc107951

Improve some of error/warning messages

Bug: http://b/20464031
Change-Id: I948141c46f9e054fc45f5934153dee56ce3cd558

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 34b335e..3e5b05e 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -316,6 +316,7 @@
   std::vector<char> buf(PATH_MAX), proc_self_fd(PATH_MAX);
   snprintf(&proc_self_fd[0], proc_self_fd.size(), "/proc/self/fd/%d", fd);
   if (readlink(&proc_self_fd[0], &buf[0], buf.size()) == -1) {
+    PRINT("readlink('%s') failed: %s [fd=%d]", &proc_self_fd[0], strerror(errno), fd);
     return false;
   }
 
@@ -1256,7 +1257,7 @@
 
   std::string realpath = name;
   if (!realpath_fd(fd, &realpath)) {
-    PRINT("cannot resolve realpath for the library \"%s\": %s", name, strerror(errno));
+    PRINT("warning: unable to get realpath for the library \"%s\". Will use given name.", name);
     realpath = name;
   }
 
@@ -2730,7 +2731,7 @@
         set_dt_flags_1(d->d_un.d_val);
 
         if ((d->d_un.d_val & ~SUPPORTED_DT_FLAGS_1) != 0) {
-          DL_WARN("Unsupported flags DT_FLAGS_1=%p", reinterpret_cast<void*>(d->d_un.d_val));
+          DL_WARN("%s: unsupported flags DT_FLAGS_1=%p", get_realpath(), reinterpret_cast<void*>(d->d_un.d_val));
         }
         break;
 #if defined(__mips__)