* gdbtk.tcl (build_framework): Fix bug with setting window titles.

[binutils.git] / bfd / cisco-core.c

diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c
index b20e309be045f44d9ebf04192a4d90e476d50fcf..a253675a8d2d754793037c36535ff95ca2c009dc 100644 (file)
--- a/bfd/cisco-core.c
+++ b/bfd/cisco-core.c
@@ -67,8 +67,8 @@ cisco_core_file_p (abfd)
   nread = bfd_read (buf, 1, 4, abfd);
   if (nread != 4)
     {
-      /* Maybe the file is too small (FIXME: what about other errors).  */
-      bfd_set_error (bfd_error_wrong_format);
+      if (bfd_get_error () != bfd_error_system_call)
+       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
   crashinfo_offset = bfd_get_32 (abfd, buf);
@@ -79,8 +79,8 @@ cisco_core_file_p (abfd)
   nread = bfd_read (&crashinfo, 1, sizeof (crashinfo), abfd);
   if (nread != sizeof (crashinfo))
     {
-      /* Maybe the file is too small (FIXME: what about other errors).  */
-      bfd_set_error (bfd_error_wrong_format);
+      if (bfd_get_error () != bfd_error_system_call)
+       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
 
@@ -112,8 +112,9 @@ cisco_core_file_p (abfd)
 
   /* OK, we believe you.  You're a core file.  */
 
-  abfd->tdata.cisco_core_data = (struct cisco_core_struct *)
-    bfd_zmalloc (abfd, sizeof (struct cisco_core_struct));
+  abfd->tdata.cisco_core_data =
+    ((struct cisco_core_struct *)
+     bfd_zmalloc (sizeof (struct cisco_core_struct)));
   if (abfd->tdata.cisco_core_data == NULL)
     {
       bfd_set_error (bfd_error_no_memory);
@@ -245,7 +246,7 @@ cisco_core_file_p (abfd)
        free (asect);
        asect = nextsect;
       }
-    free (abfd->tdata);
+    free (abfd->tdata.cisco_core_data);
     return NULL;
   }
 }
@@ -272,73 +273,6 @@ cisco_core_file_matches_executable_p (core_bfd, exec_bfd)
   return true;
 }
 \f
-/* No archive file support via this BFD */
-#define        cisco_openr_next_archived_file  bfd_generic_openr_next_archived_file
-#define        cisco_generic_stat_arch_elt             bfd_generic_stat_arch_elt
-#define        cisco_slurp_armap                       bfd_false
-#define        cisco_slurp_extended_name_table bfd_true
-#define        cisco_write_armap                       (boolean (*) PARAMS     \
-    ((bfd *arch, unsigned int elength, struct orl *map, \
-      unsigned int orl_count, int stridx))) bfd_false
-#define        cisco_truncate_arname           bfd_dont_truncate_arname
-#define        aout_32_openr_next_archived_file        bfd_generic_openr_next_archived_file
-
-#define        cisco_close_and_cleanup         bfd_generic_close_and_cleanup
-#define        cisco_set_section_contents              (boolean (*) PARAMS     \
-        ((bfd *abfd, asection *section, PTR data, file_ptr offset,     \
-        bfd_size_type count))) bfd_generic_set_section_contents
-#define        cisco_get_section_contents              bfd_generic_get_section_contents
-#define        cisco_new_section_hook          (boolean (*) PARAMS     \
-       ((bfd *, sec_ptr))) bfd_true
-#define        cisco_get_symtab_upper_bound    bfd_0u
-#define        cisco_get_symtab                        (unsigned int (*) PARAMS \
-        ((bfd *, struct symbol_cache_entry **))) bfd_0u
-#define        cisco_get_reloc_upper_bound             (unsigned int (*) PARAMS \
-       ((bfd *, sec_ptr))) bfd_0u
-#define        cisco_canonicalize_reloc                (unsigned int (*) PARAMS \
-       ((bfd *, sec_ptr, arelent **, struct symbol_cache_entry**))) bfd_0u
-#define        cisco_make_empty_symbol         (struct symbol_cache_entry * \
-       (*) PARAMS ((bfd *))) bfd_false
-#define        cisco_print_symbol                      (void (*) PARAMS        \
-       ((bfd *, PTR, struct symbol_cache_entry  *,                     \
-       bfd_print_symbol_type))) bfd_false
-#define        cisco_get_symbol_info           (void (*) PARAMS        \
-       ((bfd *, struct symbol_cache_entry  *,                  \
-       symbol_info *))) bfd_false
-#define        cisco_get_lineno                        (alent * (*) PARAMS     \
-       ((bfd *, struct symbol_cache_entry *))) bfd_nullvoidptr
-#define        cisco_set_arch_mach                     (boolean (*) PARAMS     \
-       ((bfd *, enum bfd_architecture, unsigned long))) bfd_false
-#define        cisco_find_nearest_line         (boolean (*) PARAMS     \
-        ((bfd *abfd, struct sec  *section,                             \
-         struct symbol_cache_entry  **symbols,bfd_vma offset,          \
-         CONST char **file, CONST char **func, unsigned int *line))) bfd_false
-#define        cisco_sizeof_headers            (int (*) PARAMS \
-       ((bfd *, boolean))) bfd_0
-
-#define cisco_bfd_debug_info_start             bfd_void
-#define cisco_bfd_debug_info_end               bfd_void
-#define cisco_bfd_debug_info_accumulate        (void (*) PARAMS        \
-       ((bfd *, struct sec *))) bfd_void
-#define cisco_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
-#define cisco_bfd_relax_section                bfd_generic_relax_section
-#define cisco_bfd_reloc_type_lookup \
-  ((CONST struct reloc_howto_struct *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
-#define cisco_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
-#define cisco_bfd_link_hash_table_create \
-  ((struct bfd_link_hash_table *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
-#define cisco_bfd_link_add_symbols \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
-#define cisco_bfd_final_link \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
-#define cisco_bfd_copy_private_section_data \
-  ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_false)
-#define cisco_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_false)
-#define cisco_bfd_is_local_label \
-  ((boolean (*) PARAMS ((bfd *, asection *))) bfd_false)
-
 bfd_target cisco_core_vec =
   {
     "trad-core",
@@ -375,6 +309,14 @@ bfd_target cisco_core_vec =
      bfd_false, bfd_false
     },
     
-    JUMP_TABLE(cisco),
+       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+       BFD_JUMP_TABLE_COPY (_bfd_generic),
+       BFD_JUMP_TABLE_CORE (cisco),
+       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+       BFD_JUMP_TABLE_WRITE (_bfd_generic),
+       BFD_JUMP_TABLE_LINK (_bfd_nolink),
+
     (PTR) 0                    /* backend_data */
 };