summaryrefslogtreecommitdiff
path: root/bfd/irix-core.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2001-09-18 09:57:26 +0000
committerAlan Modra <amodra@gmail.com>2001-09-18 09:57:26 +0000
commitdc810e3900d47ab2eea86d50231ff2e70b596847 (patch)
tree13fc3d267fb99c450380f08a0775b2dff076b8d7 /bfd/irix-core.c
parent417412a27c87b0e738a21122a38d48aa35317eb8 (diff)
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become bfd_bread and bfd_bwrite. o bfd_*alloc now all take a bfd_size_type arg, and will error if size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files or bugs in linker scripts etc. o file_ptr becomes a bfd_signed_vma. Besides matching sizes with various other types involved in handling sections, this should make it easier for bfd to support a 64 bit off_t on 32 bit hosts that provide it. o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*) generally available. They now cast their args to bfd_vma and bfd_byte * as appropriate, which removes a swag of casts from the source. o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and aout-encap.c. o Zillions of formatting and -Wconversion fixes.
Diffstat (limited to 'bfd/irix-core.c')
-rw-r--r--bfd/irix-core.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/bfd/irix-core.c b/bfd/irix-core.c
index 2de76f12e1..3ee3695b62 100644
--- a/bfd/irix-core.c
+++ b/bfd/irix-core.c
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <core.out.h>
-struct sgi_core_struct
+struct sgi_core_struct
{
int sig;
char cmd[CORE_NAMESIZE];
@@ -41,11 +41,11 @@ struct sgi_core_struct
#define core_command(bfd) (core_hdr(bfd)->cmd)
static asection *make_bfd_asection
- PARAMS ((bfd *, CONST char *, flagword, bfd_size_type, bfd_vma, file_ptr));
+ PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
static const bfd_target *irix_core_core_file_p PARAMS ((bfd *));
static char *irix_core_core_file_failing_command PARAMS ((bfd *));
static int irix_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean irix_core_core_file_matches_executable_p
+static boolean irix_core_core_file_matches_executable_p
PARAMS ((bfd *, bfd *));
static asymbol *irix_core_make_empty_symbol PARAMS ((bfd *));
static void swap_abort PARAMS ((void));
@@ -53,7 +53,7 @@ static void swap_abort PARAMS ((void));
static asection *
make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
bfd *abfd;
- CONST char *name;
+ const char *name;
flagword flags;
bfd_size_type _raw_size;
bfd_vma vma;
@@ -83,8 +83,9 @@ irix_core_core_file_p (abfd)
char *secname;
struct coreout coreout;
struct idesc *idg, *idf, *ids;
+ bfd_size_type amt;
- val = bfd_read ((PTR)&coreout, 1, sizeof coreout, abfd);
+ val = bfd_bread ((PTR) &coreout, (bfd_size_type) sizeof coreout, abfd);
if (val != sizeof coreout)
{
if (bfd_get_error () != bfd_error_system_call)
@@ -99,7 +100,8 @@ irix_core_core_file_p (abfd)
|| coreout.c_version != CORE_VERSION1)
return 0;
- core_hdr (abfd) = (struct sgi_core_struct *) bfd_zalloc (abfd, sizeof (struct sgi_core_struct));
+ amt = sizeof (struct sgi_core_struct);
+ core_hdr (abfd) = (struct sgi_core_struct *) bfd_zalloc (abfd, amt);
if (!core_hdr (abfd))
return NULL;
@@ -113,7 +115,7 @@ irix_core_core_file_p (abfd)
{
struct vmap vmap;
- val = bfd_read ((PTR)&vmap, 1, sizeof vmap, abfd);
+ val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd);
if (val != sizeof vmap)
break;
@@ -165,7 +167,7 @@ irix_core_core_file_p (abfd)
idg->i_len + idf->i_len + ids->i_len,
0,
idg->i_offset);
-
+
/* OK, we believe you. You're a core file (sure, sure). */
bfd_default_set_arch_mach (abfd, bfd_arch_mips, 0);
@@ -197,7 +199,8 @@ static asymbol *
irix_core_make_empty_symbol (abfd)
bfd *abfd;
{
- asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
+ bfd_size_type amt = sizeof (asymbol);
+ asymbol *new = (asymbol *) bfd_zalloc (abfd, amt);
if (new)
new->the_bfd = abfd;
return new;
@@ -260,7 +263,7 @@ const bfd_target irix_core_vec =
bfd_false, bfd_false,
bfd_false, bfd_false
},
-
+
BFD_JUMP_TABLE_GENERIC (_bfd_generic),
BFD_JUMP_TABLE_COPY (_bfd_generic),
BFD_JUMP_TABLE_CORE (irix_core),
@@ -272,7 +275,7 @@ const bfd_target irix_core_vec =
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
NULL,
-
+
(PTR) 0 /* backend_data */
};