Change int to bool for the relocate_* functions

These parameters are only used as bools. This also
renames "flag" to "relocatable" to make it clearer
what it does.

gdb/ChangeLog:

2019-09-06  Christian Biesinger  <cbiesinger@google.com>

	* defs.h (relocate_gdb_directory): Change int to bool in
	signature and rename flag to relocatable.
	* main.c (relocate_path): Likewise.
	(relocate_gdb_directory): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 40bd4d0d02bae102ea88bfb8a9310845a988444b..acfc888aac220fa326f799a611f5cde7dc6a9405 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-06  Christian Biesinger  <cbiesinger@google.com>
+
+       * defs.h (relocate_gdb_directory): Change int to bool in
+       signature and rename flag to relocatable.
+       * main.c (relocate_path): Likewise.
+       (relocate_gdb_directory): Likewise.
+
 2019-09-06  Alan Modra  <amodra@gmail.com>
 
        * coffread.c (coff_symfile_read): Constify filename variable.

diff --git a/gdb/defs.h b/gdb/defs.h
index ece3006de4ea6a882b21f339ddb22faaa52aa12e..14e0a3e1d1df3d52c2bef6640bdf55a82d5f097c 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -282,7 +282,7 @@ struct value;
 
 /* This really belong in utils.c (path-utils.c?), but it references some
    globals that are currently only available to main.c.  */
-extern char *relocate_gdb_directory (const char *initial, int flag);
+extern char *relocate_gdb_directory (const char *initial, bool relocatable);
 
 \f
 /* Annotation stuff.  */

diff --git a/gdb/main.c b/gdb/main.c
index 678c413021c7db30149f28c028c289ced2c1861d..129c57c1d109cecfd489e0f3ed72ce5c20a12944 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -139,14 +139,14 @@ set_gdb_data_directory (const char *new_datadir)
 
 /* Relocate a file or directory.  PROGNAME is the name by which gdb
    was invoked (i.e., argv[0]).  INITIAL is the default value for the
-   file or directory.  FLAG is true if the value is relocatable, false
-   otherwise.  Returns a newly allocated string; this may return NULL
-   under the same conditions as make_relative_prefix.  */
+   file or directory.  RELOCATABLE is true if the value is relocatable,
+   false otherwise.  Returns a newly allocated string; this may return
+   NULL under the same conditions as make_relative_prefix.  */
 
 static char *
-relocate_path (const char *progname, const char *initial, int flag)
+relocate_path (const char *progname, const char *initial, bool relocatable)
 {
-  if (flag)
+  if (relocatable)
     return make_relative_prefix (progname, BINDIR, initial);
   return xstrdup (initial);
 }
@@ -158,11 +158,11 @@ relocate_path (const char *progname, const char *initial, int flag)
    function always returns a newly-allocated string.  */
 
 char *
-relocate_gdb_directory (const char *initial, int flag)
+relocate_gdb_directory (const char *initial, bool relocatable)
 {
   char *dir;
 
-  dir = relocate_path (gdb_program_name, initial, flag);
+  dir = relocate_path (gdb_program_name, initial, relocatable);
   if (dir)
     {
       struct stat s;