* irix-core.c (do_sections): Replace + by | in expression.

        (irix_core_core_file_matches_executable_p): Add ATTRIBUTE_UNUSED
        to unused parameters to avoid a compiler warning.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 546904e2badb4a8cb550159fe857263775bc0e33..807abd07043e252349c4bd238d8e147995c1280e 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-28  Joel Brobecker  <brobecker@adacore.com>
+
+       * irix-core.c (do_sections): Replace + by | in expression.
+       (irix_core_core_file_matches_executable_p): Add ATTRIBUTE_UNUSED
+       to unused parameters to avoid a compiler warning.
+
 2005-03-28  Mark Kettenis  <kettenis@gnu.org>
 
        * netbsd-core.c: Convert to ISO C.  Fix formatting.

diff --git a/bfd/irix-core.c b/bfd/irix-core.c
index 740907b86eca0278d33e3b7c44efba514d438f92..c7e1268dd9b0f44a4ba193b97663126b04e34ae6 100644 (file)
--- a/bfd/irix-core.c
+++ b/bfd/irix-core.c
@@ -152,7 +152,7 @@ do_sections (abfd, coreout)
        continue;
 
       if (!make_bfd_asection (abfd, secname,
-                             SEC_ALLOC | SEC_LOAD+SEC_HAS_CONTENTS,
+                             SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                              vmap.v_len, vmap.v_vaddr, vmap.v_offset))
        /* Fail.  */
        return 0;
@@ -288,7 +288,8 @@ irix_core_core_file_failing_signal (abfd)
 
 static bfd_boolean
 irix_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
+     bfd *core_bfd ATTRIBUTE_UNUSED;
+     bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
   return TRUE;                 /* XXX - FIXME */
 }