Automatic date update in version.in

[binutils-gdb.git] / bfd / corefile.c

diff --git a/bfd/corefile.c b/bfd/corefile.c
index 605be8d33da1569edab9c2abc9b0bfa9cc7b58dc..4f70fd925d6f314ccc925df2ad8a7af1afd7f66d 100644 (file)
--- a/bfd/corefile.c
+++ b/bfd/corefile.c
@@ -1,6 +1,5 @@
 /* Core file generic interface routines for BFD.
 /* Core file generic interface routines for BFD.

-   Copyright 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2003, 2005,
-   2007 Free Software Foundation, Inc.
+   Copyright (C) 1990-2022 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -112,7 +111,7 @@ FUNCTION
        core_file_matches_executable_p
 
 SYNOPSIS
        core_file_matches_executable_p
 
 SYNOPSIS

-       bfd_boolean core_file_matches_executable_p
+       bool core_file_matches_executable_p

          (bfd *core_bfd, bfd *exec_bfd);
 
 DESCRIPTION
          (bfd *core_bfd, bfd *exec_bfd);
 
 DESCRIPTION


@@ -121,13 +120,13 @@ DESCRIPTION
        @var{exec_bfd}, <<FALSE>> otherwise.
 */
 
        @var{exec_bfd}, <<FALSE>> otherwise.
 */
 

-bfd_boolean
+bool

 core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 {
   if (core_bfd->format != bfd_core || exec_bfd->format != bfd_object)
     {
       bfd_set_error (bfd_error_wrong_format);
 core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 {
   if (core_bfd->format != bfd_core || exec_bfd->format != bfd_object)
     {
       bfd_set_error (bfd_error_wrong_format);

-      return FALSE;
+      return false;

     }
 
   return BFD_SEND (core_bfd, _core_file_matches_executable_p,
     }
 
   return BFD_SEND (core_bfd, _core_file_matches_executable_p,


@@ -136,47 +135,47 @@ core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 
 /*
 FUNCTION
 
 /*
 FUNCTION

-        generic_core_file_matches_executable_p
+       generic_core_file_matches_executable_p

 
 SYNOPSIS
 
 SYNOPSIS

-        bfd_boolean generic_core_file_matches_executable_p
-          (bfd *core_bfd, bfd *exec_bfd);
+       bool generic_core_file_matches_executable_p
+         (bfd *core_bfd, bfd *exec_bfd);

 
 DESCRIPTION
 
 DESCRIPTION

-        Return TRUE if the core file attached to @var{core_bfd}
-        was generated by a run of the executable file attached
-        to @var{exec_bfd}.  The match is based on executable
-        basenames only.
-
-        Note: When not able to determine the core file failing
-        command or the executable name, we still return TRUE even
-        though we're not sure that core file and executable match.
-        This is to avoid generating a false warning in situations
-        where we really don't know whether they match or not.
+       Return TRUE if the core file attached to @var{core_bfd}
+       was generated by a run of the executable file attached
+       to @var{exec_bfd}.  The match is based on executable
+       basenames only.
+
+       Note: When not able to determine the core file failing
+       command or the executable name, we still return TRUE even
+       though we're not sure that core file and executable match.
+       This is to avoid generating a false warning in situations
+       where we really don't know whether they match or not.

 */
 
 */
 

-bfd_boolean
+bool

 generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 {
 generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 {

-  char *exec;
-  char *core;
-  char *last_slash;
+  const char *exec;
+  const char *core;
+  const char *last_slash;

 
   if (exec_bfd == NULL || core_bfd == NULL)
 
   if (exec_bfd == NULL || core_bfd == NULL)

-    return TRUE;
+    return true;

 
   /* The cast below is to avoid a compiler warning due to the assignment
      of the const char * returned by bfd_core_file_failing_command to a
      non-const char *.  In this case, the assignement does not lead to
      breaking the const, as we're only reading the string.  */
 
   /* The cast below is to avoid a compiler warning due to the assignment
      of the const char * returned by bfd_core_file_failing_command to a
      non-const char *.  In this case, the assignement does not lead to
      breaking the const, as we're only reading the string.  */

-     
-  core = (char *) bfd_core_file_failing_command (core_bfd);
+
+  core = bfd_core_file_failing_command (core_bfd);

   if (core == NULL)
   if (core == NULL)

-    return TRUE;
+    return true;

 
   exec = bfd_get_filename (exec_bfd);
   if (exec == NULL)
 
   exec = bfd_get_filename (exec_bfd);
   if (exec == NULL)

-    return TRUE;
+    return true;

 
   last_slash = strrchr (core, '/');
   if (last_slash != NULL)
 
   last_slash = strrchr (core, '/');
   if (last_slash != NULL)


@@ -185,7 +184,7 @@ generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
   last_slash = strrchr (exec, '/');
   if (last_slash != NULL)
     exec = last_slash + 1;
   last_slash = strrchr (exec, '/');
   if (last_slash != NULL)
     exec = last_slash + 1;

-  
-  return strcmp (exec, core) == 0;
+
+  return filename_cmp (exec, core) == 0;

 }
 
 }