bfd_size_type to size_t

[deliverable/binutils-gdb.git] / bfd / netbsd-core.c

diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index b36e3af8ef02a455f8084403c21b25dd9d4a804a..ae88fd6f74165017b92186e2e45f79a1ee6e0885 100644 (file)
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -1,7 +1,5 @@
 /* BFD back end for NetBSD style core files
 /* BFD back end for NetBSD style core files

-   Copyright 1988, 1989, 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1988-2020 Free Software Foundation, Inc.

    Written by Paul Kranenburg, EUR
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Paul Kranenburg, EUR
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -24,7 +22,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"

-#include "libaout.h"           /* BFD a.out internal data structures.  */
+#include "libaout.h"          /* BFD a.out internal data structures.  */

 
 #include <sys/param.h>
 #include <sys/dir.h>
 
 #include <sys/param.h>
 #include <sys/dir.h>


@@ -62,7 +60,7 @@ netbsd_core_file_p (bfd *abfd)
   asection *asect;
   struct core core;
   struct coreseg coreseg;
   asection *asect;
   struct core core;
   struct coreseg coreseg;

-  bfd_size_type amt = sizeof core;
+  size_t amt = sizeof core;

 
   val = bfd_bread (&core, amt, abfd);
   if (val != sizeof core)
 
   val = bfd_bread (&core, amt, abfd);
   if (val != sizeof core)


@@ -200,10 +198,6 @@ netbsd_core_file_p (bfd *abfd)
       bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
       break;
 
       bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
       break;
 

-    case M_88K_OPENBSD:
-      bfd_default_set_arch_mach (abfd, bfd_arch_m88k, 0);
-      break;
-

     case M_HPPA_OPENBSD:
       bfd_default_set_arch_mach (abfd, bfd_arch_hppa, bfd_mach_hppa11);
       break;
     case M_HPPA_OPENBSD:
       bfd_default_set_arch_mach (abfd, bfd_arch_hppa, bfd_mach_hppa11);
       break;


@@ -267,7 +261,7 @@ swap_abort (void)
 #define        NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define        NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
 #define        NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define        NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 

-const bfd_target netbsd_core_vec =
+const bfd_target core_netbsd_vec =

   {
     "netbsd-core",
     bfd_target_unknown_flavour,
   {
     "netbsd-core",
     bfd_target_unknown_flavour,


@@ -281,6 +275,7 @@ const bfd_target netbsd_core_vec =
     0,                         /* Symbol prefix.  */
     ' ',                       /* ar_pad_char.  */
     16,                                /* ar_max_namelen.  */
     0,                         /* Symbol prefix.  */
     ' ',                       /* ar_pad_char.  */
     16,                                /* ar_max_namelen.  */

+    0,                         /* Match priority.  */

     NO_GET64, NO_GETS64, NO_PUT64,     /* 64 bit data.  */
     NO_GET, NO_GETS, NO_PUT,           /* 32 bit data.  */
     NO_GET, NO_GETS, NO_PUT,           /* 16 bit data.  */
     NO_GET64, NO_GETS64, NO_PUT64,     /* 64 bit data.  */
     NO_GET, NO_GETS, NO_PUT,           /* 32 bit data.  */
     NO_GET, NO_GETS, NO_PUT,           /* 16 bit data.  */


@@ -295,12 +290,16 @@ const bfd_target netbsd_core_vec =
       netbsd_core_file_p               /* A core file.  */
     },
     {                                  /* bfd_set_format.  */
       netbsd_core_file_p               /* A core file.  */
     },
     {                                  /* bfd_set_format.  */

-      bfd_false, bfd_false,
-      bfd_false, bfd_false
+      _bfd_bool_bfd_false_error,
+      _bfd_bool_bfd_false_error,
+      _bfd_bool_bfd_false_error,
+      _bfd_bool_bfd_false_error

     },
     {                                  /* bfd_write_contents.  */
     },
     {                                  /* bfd_write_contents.  */

-      bfd_false, bfd_false,
-      bfd_false, bfd_false
+      _bfd_bool_bfd_false_error,
+      _bfd_bool_bfd_false_error,
+      _bfd_bool_bfd_false_error,
+      _bfd_bool_bfd_false_error

     },
 
     BFD_JUMP_TABLE_GENERIC (_bfd_generic),
     },
 
     BFD_JUMP_TABLE_GENERIC (_bfd_generic),


@@ -315,5 +314,5 @@ const bfd_target netbsd_core_vec =
 
     NULL,
 
 
     NULL,
 

-    (PTR) 0                            /* Backend_data.  */
+    NULL                               /* Backend_data.  */

   };
   };