This is the mail archive of the mailing list for the binutils project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Don't make_bfd_vms_lib archive functions NULL

Contrary to the comment, they can in fact be called.  An error is
better than a segfault.

	* libbfd-in.h (_bfd_vms_lib_slurp_armap): Use _bfd_noarchive function.
	(_bfd_vms_lib_slurp_extended_name_table: Likewise.
	(_bfd_vms_lib_construct_extended_name_table: Likewise.
	(_bfd_vms_lib_truncate_arname: Likewise.
	(_bfd_vms_lib_write_armap: Likewise.
	(_bfd_vms_lib_read_ar_hdr: Likewise.
	(_bfd_vms_lib_write_ar_hdr: Likewise.
	* libbfd.h: Regenerate.

diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
index 833e1e6..fec1b89 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
@@ -373,16 +373,18 @@ extern bfd_boolean _bfd_archive_bsd44_construct_extended_name_table
 /* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get VMS style
    archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib).  Some of them
-   are irrelevant and never called, so defined as NULL.  */
+   are irrelevant.  */
 extern bfd_boolean _bfd_vms_lib_write_archive_contents (bfd *arch);
-#define _bfd_vms_lib_slurp_armap NULL
-#define _bfd_vms_lib_slurp_extended_name_table NULL
-#define _bfd_vms_lib_construct_extended_name_table NULL
-#define _bfd_vms_lib_truncate_arname NULL
-#define _bfd_vms_lib_write_armap NULL
-#define _bfd_vms_lib_read_ar_hdr NULL
-#define _bfd_vms_lib_write_ar_hdr NULL
+#define _bfd_vms_lib_slurp_armap _bfd_noarchive_slurp_armap
+#define _bfd_vms_lib_slurp_extended_name_table \
+  _bfd_noarchive_slurp_extended_name_table
+#define _bfd_vms_lib_construct_extended_name_table \
+  _bfd_noarchive_construct_extended_name_table
+#define _bfd_vms_lib_truncate_arname _bfd_noarchive_truncate_arname
+#define _bfd_vms_lib_write_armap _bfd_noarchive_write_armap
+#define _bfd_vms_lib_read_ar_hdr _bfd_noarchive_read_ar_hdr
+#define _bfd_vms_lib_write_ar_hdr _bfd_noarchive_write_ar_hdr
 extern bfd *_bfd_vms_lib_openr_next_archived_file (bfd *, bfd *);
 extern bfd *_bfd_vms_lib_get_elt_at_index (bfd *, symindex);
 extern int _bfd_vms_lib_generic_stat_arch_elt (bfd *, struct stat *);

Alan Modra
Australia Development Lab, IBM

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]