summaryrefslogtreecommitdiffstats
path: root/libelf/elf_readall.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2005-08-25 01:49:35 +0000
committerRoland McGrath <roland@redhat.com>2005-08-25 01:49:35 +0000
commit4c305da9de0ecfe9af64cb6787b2b4b8a6aa8dd5 (patch)
treeaeba7918420be8f6c080f902529a482993388e5f /libelf/elf_readall.c
parent6830bc40bb6a38dee917bebc856c7c1ba5126e24 (diff)
2005-08-24 Roland McGrath <roland@redhat.com>
* line2addr.c (print_address): Omit () for DSOs.
Diffstat (limited to 'libelf/elf_readall.c')
-rw-r--r--libelf/elf_readall.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/libelf/elf_readall.c b/libelf/elf_readall.c
index efe44bf8..d36da270 100644
--- a/libelf/elf_readall.c
+++ b/libelf/elf_readall.c
@@ -1,5 +1,5 @@
/* Read all of the file associated with the descriptor.
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005 Red Hat, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
Contributed by Ulrich Drepper <drepper@redhat.com>, 1998.
This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,8 @@
# include <config.h>
#endif
-#include <errno.h>
#include <unistd.h>
-#include <system.h>
#include "libelfP.h"
#include "common.h"
@@ -80,10 +78,8 @@ __libelf_readall (elf)
if (mem != NULL)
{
/* Read the file content. */
- if (unlikely ((size_t) pread_retry (elf->fildes, mem,
- elf->maximum_size,
- elf->start_offset)
- != elf->maximum_size))
+ if ((size_t) pread (elf->fildes, mem, elf->maximum_size,
+ elf->start_offset) != elf->maximum_size)
{
/* Something went wrong. */
__libelf_seterrno (ELF_E_READ_ERROR);