From 1178743e4c05d9c0daad5a105277fbc42872c9ea Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Thu, 4 Mar 2021 07:30:42 -0700
Subject: [PATCH] Use "bool" in ada-lang.c

Christian suggested switching an "int" in ada-lang.c to "bool"
instead.  This patch makes this change.  Tested on x86-64 Fedora 32.

gdb/ChangeLog
2021-03-04  Tom Tromey  <tromey@adacore.com>

	* ada-lang.c (struct match_data) <found_sym>: Now bool.
	(aux_add_nonlocal_symbols): Update.
	(ada_add_block_symbols): Change "found_sym" to bool.
---
 gdb/ChangeLog  |  6 ++++++
 gdb/ada-lang.c | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0587752cb5b..0126083241b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2021-03-04  Tom Tromey  <tromey@adacore.com>
+
+	* ada-lang.c (struct match_data) <found_sym>: Now bool.
+	(aux_add_nonlocal_symbols): Update.
+	(ada_add_block_symbols): Change "found_sym" to bool.
+
 2021-03-03  Tom Tromey  <tromey@adacore.com>
 
 	* ada-lang.c (ada_resolve_function): Update comment.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f8bf407fa6c..bb50222f81c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5299,7 +5299,7 @@ struct match_data
   struct objfile *objfile = nullptr;
   std::vector<struct block_symbol> *resultp;
   struct symbol *arg_sym = nullptr;
-  int found_sym = 0;
+  bool found_sym = false;
 };
 
 /* A callback for add_nonlocal_symbols that adds symbol, found in BSYM,
@@ -5324,7 +5324,7 @@ aux_add_nonlocal_symbols (struct block_symbol *bsym,
 	add_defn_to_vec (*data->resultp,
 			 fixup_symbol_section (data->arg_sym, data->objfile),
 			 block);
-      data->found_sym = 0;
+      data->found_sym = false;
       data->arg_sym = NULL;
     }
   else 
@@ -5335,7 +5335,7 @@ aux_add_nonlocal_symbols (struct block_symbol *bsym,
 	data->arg_sym = sym;
       else
 	{
-	  data->found_sym = 1;
+	  data->found_sym = true;
 	  add_defn_to_vec (*data->resultp,
 			   fixup_symbol_section (sym, data->objfile),
 			   block);
@@ -5531,7 +5531,7 @@ add_nonlocal_symbols (std::vector<struct block_symbol> &result,
 
 	  if (ada_add_block_renamings (result, global_block, lookup_name,
 				       domain))
-	    data.found_sym = 1;
+	    data.found_sym = true;
 	}
     }
 
@@ -5998,11 +5998,11 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
   /* A matching argument symbol, if any.  */
   struct symbol *arg_sym;
   /* Set true when we find a matching non-argument symbol.  */
-  int found_sym;
+  bool found_sym;
   struct symbol *sym;
 
   arg_sym = NULL;
-  found_sym = 0;
+  found_sym = false;
   for (sym = block_iter_match_first (block, lookup_name, &iter);
        sym != NULL;
        sym = block_iter_match_next (lookup_name, &iter))
@@ -6015,7 +6015,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
 		arg_sym = sym;
 	      else
 		{
-		  found_sym = 1;
+		  found_sym = true;
 		  add_defn_to_vec (result,
 				   fixup_symbol_section (sym, objfile),
 				   block);
@@ -6027,7 +6027,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
   /* Handle renamings.  */
 
   if (ada_add_block_renamings (result, block, lookup_name, domain))
-    found_sym = 1;
+    found_sym = true;
 
   if (!found_sym && arg_sym != NULL)
     {
@@ -6039,7 +6039,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
   if (!lookup_name.ada ().wild_match_p ())
     {
       arg_sym = NULL;
-      found_sym = 0;
+      found_sym = false;
       const std::string &ada_lookup_name = lookup_name.ada ().lookup_name ();
       const char *name = ada_lookup_name.c_str ();
       size_t name_len = ada_lookup_name.size ();
@@ -6069,7 +6069,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result,
 		      arg_sym = sym;
 		    else
 		      {
-			found_sym = 1;
+			found_sym = true;
 			add_defn_to_vec (result,
 					 fixup_symbol_section (sym, objfile),
 					 block);
-- 
2.30.2