[pushed] gdb: bool-ify users of file_is_auto_load_safe

[pushed] gdb: bool-ify users of file_is_auto_load_safe

[Simon Marchi]

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
---
 gdb/ChangeLog   |  5 +++++
 gdb/auto-load.c | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e9f7982cf00a..58392b25cd9f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
 	* auto-load.h (auto_load_gdb_scripts_enabled): Return bool, move
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 0d5532b4882e..b6cb79af34eb 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);
 
-- 
2.29.2

Re: [pushed] gdb: bool-ify users of file_is_auto_load_safe

[Christian Biesinger]

On Wed, Jan 13, 2021 at 6:01 PM Simon Marchi via Gdb-patches
<gdb-patches@sourceware.org> wrote:
> -  int is_safe, in_hash_table;
> +  int in_hash_table;

That sounds like a good candidate for bool-ification as well?

Christian

Re: [pushed] gdb: bool-ify users of file_is_auto_load_safe

[Simon Marchi]

On 2021-01-13 12:03 p.m., Christian Biesinger wrote:
> On Wed, Jan 13, 2021 at 6:01 PM Simon Marchi via Gdb-patches
> <gdb-patches@sourceware.org> wrote:
>> -  int is_safe, in_hash_table;
>> +  int in_hash_table;
> 
> That sounds like a good candidate for bool-ification as well?
> 
> Christian
> 

Yes, why not.

Simon