diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-01-13 12:00:37 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-01-13 12:00:37 -0500 |
| commit | 5bf7e91b2b47295b021ce3a06688d8cfb74e7fab (patch) | |
| tree | 935a268263acbc64c00dfe2bc9d2ab207d284cf8 | |
| parent | db972fce46368f7d2a60e43aca78f0757515c0c8 (diff) | |
| download | gdb-5bf7e91b2b47295b021ce3a06688d8cfb74e7fab.zip gdb-5bf7e91b2b47295b021ce3a06688d8cfb74e7fab.tar.gz gdb-5bf7e91b2b47295b021ce3a06688d8cfb74e7fab.tar.bz2 | |
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
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/auto-load.c | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e9f7982..58392b2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 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> + * auto-load.h (auto_load_gdb_scripts_enabled): Return bool, move comment here. * auto-load.c (auto_load_gdb_scripts_enabled): Return bool, move diff --git a/gdb/auto-load.c b/gdb/auto-load.c index 0d5532b..b6cb79a 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -808,10 +808,9 @@ auto_load_objfile_script_1 (struct objfile *objfile, const char *realname, if (input) { - int is_safe; struct auto_load_pspace_info *pspace_info; - is_safe + bool is_safe = file_is_auto_load_safe (debugfile, _("auto-load: Loading %s script \"%s\"" " 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; const char *newline, *script_text; 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. It must not contain any kind of space character. */ @@ -1022,12 +1021,13 @@ of file %ps."), return; } - is_safe = file_is_auto_load_safe (objfile_name (objfile), - _("auto-load: Loading %s script " - "\"%s\" from section \"%s\" of " - "objfile \"%s\".\n"), - ext_lang_name (language), name, - section_name, objfile_name (objfile)); + bool is_safe + = file_is_auto_load_safe (objfile_name (objfile), + _("auto-load: Loading %s script " + "\"%s\" from section \"%s\" of " + "objfile \"%s\".\n"), + ext_lang_name (language), name, + section_name, objfile_name (objfile)); in_hash_table = maybe_add_script_text (pspace_info, is_safe, name, language); |