From 39dc26fb056ee976cdad5c2bbd60103d048253a7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 17 Aug 2001 03:19:01 +0000 Subject: * bfd.c (enum bfd_error): Add bfd_error_wrong_object_format. (bfd_errmsgs): Add corresponding message. * archive.c (bfd_generic_archive_p): Don't release bfd_ardata when finding an archive that contains different format object files. Return bfd_error_wrong_object_format for this case. * format.c: Formatting fixes. s/CONST/const/. (bfd_check_format_matches): Accept archives that give bfd_error_wrong_object_format if no full match is found. Tidy code handling matching_vector. Don't return a pointer to freed memory in `matching'. Handle ambiguous matches as for partial archive matches. * bfd-in2.h: Regenerate. --- bfd/bfd.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bfd/bfd.c') diff --git a/bfd/bfd.c b/bfd/bfd.c index ca50aac13e7..8305ddc23a2 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -248,6 +248,7 @@ CODE_FRAGMENT . bfd_error_system_call, . bfd_error_invalid_target, . bfd_error_wrong_format, +. bfd_error_wrong_object_format, . bfd_error_invalid_operation, . bfd_error_no_memory, . bfd_error_no_symbols, @@ -275,6 +276,7 @@ const char *const bfd_errmsgs[] = N_("System call error"), N_("Invalid bfd target"), N_("File in wrong format"), + N_("Archive object file in wrong format"), N_("Invalid operation"), N_("Memory exhausted"), N_("No symbols"), -- cgit v1.2.1