gdb: bool-ify users of file_is_auto_load_safe

A previous patch missed those.

gdb/ChangeLog:

	* auto-load.c (auto_load_objfile_script_1): Use bool.
	(execute_script_contents): Use bool.

Change-Id: I214bf7ed25af36ced375eb3ec5a403ded2fa572e
This commit is contained in:
Simon Marchi
2021-01-13 12:00:37 -05:00
parent db972fce46
commit 5bf7e91b2b
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,8 @@
2021-01-13 Simon Marchi <simon.marchi@polymtl.ca>
* auto-load.c (auto_load_objfile_script_1): Use bool.
(execute_script_contents): Use bool.
2021-01-13 Simon Marchi <simon.marchi@polymtl.ca> 2021-01-13 Simon Marchi <simon.marchi@polymtl.ca>
* auto-load.h (auto_load_gdb_scripts_enabled): Return bool, move * auto-load.h (auto_load_gdb_scripts_enabled): Return bool, move

View File

@ -808,10 +808,9 @@ auto_load_objfile_script_1 (struct objfile *objfile, const char *realname,
if (input) if (input)
{ {
int is_safe;
struct auto_load_pspace_info *pspace_info; struct auto_load_pspace_info *pspace_info;
is_safe bool is_safe
= file_is_auto_load_safe (debugfile, = file_is_auto_load_safe (debugfile,
_("auto-load: Loading %s script \"%s\"" _("auto-load: Loading %s script \"%s\""
" by extension for objfile \"%s\".\n"), " by extension for objfile \"%s\".\n"),
@ -968,7 +967,7 @@ execute_script_contents (struct auto_load_pspace_info *pspace_info,
objfile_script_executor_func *executor; objfile_script_executor_func *executor;
const char *newline, *script_text; const char *newline, *script_text;
const char *name; const char *name;
int is_safe, in_hash_table; int in_hash_table;
/* The first line of the script is the name of the script. /* The first line of the script is the name of the script.
It must not contain any kind of space character. */ It must not contain any kind of space character. */
@ -1022,12 +1021,13 @@ of file %ps."),
return; return;
} }
is_safe = file_is_auto_load_safe (objfile_name (objfile), bool is_safe
_("auto-load: Loading %s script " = file_is_auto_load_safe (objfile_name (objfile),
"\"%s\" from section \"%s\" of " _("auto-load: Loading %s script "
"objfile \"%s\".\n"), "\"%s\" from section \"%s\" of "
ext_lang_name (language), name, "objfile \"%s\".\n"),
section_name, objfile_name (objfile)); ext_lang_name (language), name,
section_name, objfile_name (objfile));
in_hash_table = maybe_add_script_text (pspace_info, is_safe, name, language); in_hash_table = maybe_add_script_text (pspace_info, is_safe, name, language);