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

am a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."

Browse Source 
* commit 'a7916509a3446afd0e863b03e4204cee73e81555':
  Fix a TEMP_FAILURE_RETRY usage error in the linker.
This commit is contained in:
Elliott Hughes 2012-07-27 15:58:57 -07:00 committed by Android Git Automerger
commit 616f368076
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linker/linker.c
View File

@ -648,16 +648,15 @@ typedef struct {
static unsigned long static unsigned long
is_prelinked(int fd, const char *name) is_prelinked(int fd, const char *name)
{ {
off_t sz; off_t sz = lseek(fd, -sizeof(prelink_info_t), SEEK_END);
prelink_info_t info;
sz = lseek(fd, -sizeof(prelink_info_t), SEEK_END);
if (sz < 0) { if (sz < 0) {
DL_ERR("lseek() failed!"); DL_ERR("lseek() failed!");
return 0; return 0;
} }
if (TEMP_FAILURE_RETRY(read(fd, &info, sizeof(info)) != sizeof(info))) { prelink_info_t info;
int rc = TEMP_FAILURE_RETRY(read(fd, &info, sizeof(info)));
if (rc != sizeof(info)) {
WARN("Could not read prelink_info_t structure for `%s`\n", name); WARN("Could not read prelink_info_t structure for `%s`\n", name);
return 0; return 0;
} }