generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve some of error/warning messages

Browse Source 
Bug: http://b/20464031
Change-Id: I948141c46f9e054fc45f5934153dee56ce3cd558
(cherry picked from commit 087005f37e)
This commit is contained in:
Dmitriy Ivanov
2015-05-28 11:44:31 -07:00
parent 4a7c3af054
commit ca10ac6dd4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
linker/linker.cpp
View File

@@ -331,6 +331,7 @@ static bool realpath_fd(int fd, std::string* realpath) {
std::vector<char> buf(PATH_MAX), proc_self_fd(PATH_MAX); 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); 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) { 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; return false;
} }
@@ -1287,7 +1288,7 @@ static soinfo* load_library(int fd, off64_t file_offset,
std::string realpath = name; std::string realpath = name;
if (!realpath_fd(fd, &realpath)) { 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; realpath = name;
} }
@@ -2761,7 +2762,7 @@ bool soinfo::prelink_image() {
set_dt_flags_1(d->d_un.d_val); set_dt_flags_1(d->d_un.d_val);
if ((d->d_un.d_val & ~SUPPORTED_DT_FLAGS_1) != 0) { 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; break;
#if defined(__mips__) #if defined(__mips__)