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.
This commit is contained in:
Christian Biesinger 2019-09-06 14:19:40 -05:00
parent f5c3a9e305
commit ead0e69a4a
3 changed files with 15 additions and 8 deletions

View File

@ -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.

View File

@ -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);
/* Annotation stuff. */

View File

@ -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;