1 files changed, 12 insertions, 14 deletions

diff --git a/bfd/lynx-core.c b/bfd/lynx-core.c
index ee070cbc2ee..1d4a763d0dc 100644
--- a/bfd/lynx-core.c
+++ b/bfd/lynx-core.c
@@ -55,7 +55,7 @@ struct lynx_core_struct
 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;
@@ -64,7 +64,7 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
   asection *asect;
   char *newname;
 
-  newname = bfd_alloc (abfd, strlen (name) + 1);
+  newname = bfd_alloc (abfd, (bfd_size_type) strlen (name) + 1);
   if (!newname)
     return NULL;
 
@@ -87,13 +87,13 @@ const bfd_target *
 lynx_core_file_p (abfd)
      bfd *abfd;
 {
-  int val;
   int secnum;
   struct pssentry pss;
-  size_t tcontext_size;
+  bfd_size_type tcontext_size;
   core_st_t *threadp;
   int pagesize;
   asection *newsect;
+  bfd_size_type amt;
 
   pagesize = getpagesize ();	/* Serious cross-target issue here...  This
 				   really needs to come from a system-specific
@@ -101,11 +101,11 @@ lynx_core_file_p (abfd)
 
   /* Get the pss entry from the core file */
 
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return NULL;
 
-  val = bfd_read ((void *)&pss, 1, sizeof pss, abfd);
-  if (val != sizeof pss)
+  amt = sizeof pss;
+  if (bfd_bread ((void *) &pss, amt, abfd) != amt)
     {
       /* Too small to be a core file */
       if (bfd_get_error () != bfd_error_system_call)
@@ -113,8 +113,8 @@ lynx_core_file_p (abfd)
       return NULL;
     }
 
-  core_hdr (abfd) = (struct lynx_core_struct *)
-    bfd_zalloc (abfd, sizeof (struct lynx_core_struct));
+  amt = sizeof (struct lynx_core_struct);
+  core_hdr (abfd) = (struct lynx_core_struct *) bfd_zalloc (abfd, amt);
 
   if (!core_hdr (abfd))
     return NULL;
@@ -127,18 +127,16 @@ lynx_core_file_p (abfd)
 
   /* Allocate space for the thread contexts */
 
-  threadp = (core_st_t *)bfd_alloc (abfd, tcontext_size);
+  threadp = (core_st_t *) bfd_alloc (abfd, tcontext_size);
   if (!threadp)
     return NULL;
 
   /* Save thread contexts */
 
-  if (bfd_seek (abfd, pagesize, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) pagesize, SEEK_SET) != 0)
     return NULL;
 
-  val = bfd_read ((void *)threadp, pss.threadcnt, sizeof (core_st_t), abfd);
-
-  if (val != tcontext_size)
+  if (bfd_bread ((void *) threadp, tcontext_size, abfd) != tcontext_size)
     {
       /* Probably too small to be a core file */
       if (bfd_get_error () != bfd_error_system_call)