gdb/cli: convert cli_suppress_notification from int to bool

Convert the suppress_notification flag for the CLI from int to bool.

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 14422e098d43b6a26f708885aaaa621616877ed7..3c21c6e6c5b4234c34f2a0c526f7dc88244d2c7b 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -255,7 +255,7 @@ struct cmd_list_element *
 add_cmd_suppress_notification (const char *name, enum command_class theclass,
                               cmd_simple_func_ftype *fun, const char *doc,
                               struct cmd_list_element **list,
-                              int *suppress_notification)
+                              bool *suppress_notification)
 {
   struct cmd_list_element *element;
 
@@ -453,7 +453,7 @@ add_prefix_cmd_suppress_notification
                cmd_simple_func_ftype *fun,
                const char *doc, struct cmd_list_element **subcommands,
                int allow_unknown, struct cmd_list_element **list,
-               int *suppress_notification)
+               bool *suppress_notification)
 {
   struct cmd_list_element *element
     = add_prefix_cmd (name, theclass, fun, doc, subcommands,
@@ -1329,7 +1329,7 @@ add_com_alias (const char *name, cmd_list_element *target,
 struct cmd_list_element *
 add_com_suppress_notification (const char *name, enum command_class theclass,
                               cmd_simple_func_ftype *fun, const char *doc,
-                              int *suppress_notification)
+                              bool *suppress_notification)
 {
   return add_cmd_suppress_notification (name, theclass, fun, doc,
                                        &cmdlist, suppress_notification);
@@ -2506,10 +2506,10 @@ cmd_func (struct cmd_list_element *cmd, const char *args, int from_tty)
 {
   if (!cmd->is_command_class_help ())
     {
-      gdb::optional<scoped_restore_tmpl<int>> restore_suppress;
+      gdb::optional<scoped_restore_tmpl<bool>> restore_suppress;
 
       if (cmd->suppress_notification != NULL)
-       restore_suppress.emplace (cmd->suppress_notification, 1);
+       restore_suppress.emplace (cmd->suppress_notification, true);
 
       cmd->func (args, from_tty, cmd);
     }

diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index db35ea4982bfadd19ba7ffe3051859c1d4db1d0b..18db8822af34fd8ce862c206fc2c4311f29bf667 100644 (file)
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -271,7 +271,7 @@ struct cmd_list_element
      cli_suppress_notification', which will be set to true in cmd_func
      when this command is being executed.  It will be set back to false
      when the command has been executed.  */
-  int *suppress_notification = nullptr;
+  bool *suppress_notification = nullptr;
 
 private:
   /* Local state (context) for this command.  This can be anything.  */

diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 6dc3e6ae2fa9dc6f07d7a0692f6e1b92429c4526..eb1edcc4ef1544763fa68b9fa5820ac36f645057 100644 (file)
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -68,10 +68,7 @@ cli_interp::~cli_interp ()
 }
 
 /* Suppress notification struct.  */
-struct cli_suppress_notification cli_suppress_notification =
-  {
-    0   /* user_selected_context_changed */
-  };
+struct cli_suppress_notification cli_suppress_notification;
 
 /* Returns the INTERP's data cast as cli_interp if INTERP is a CLI,
    and returns NULL otherwise.  */

diff --git a/gdb/command.h b/gdb/command.h
index 1746fb4d5811024e7fee9aaaedfcba33cb8c0dfa..258ec380a448c71fac87b97f3998099f87e877c8 100644 (file)
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -378,7 +378,7 @@ typedef void cmd_simple_func_ftype (const char *args, int from_tty);
 struct cli_suppress_notification
 {
   /* Inferior, thread, frame selected notification suppressed?  */
-  int user_selected_context;
+  bool user_selected_context = false;
 };
 
 extern struct cli_suppress_notification cli_suppress_notification;
@@ -421,7 +421,7 @@ extern struct cmd_list_element *add_cmd_suppress_notification
                        (const char *name, enum command_class theclass,
                         cmd_simple_func_ftype *fun, const char *doc,
                         struct cmd_list_element **list,
-                        int *suppress_notification);
+                        bool *suppress_notification);
 
 extern struct cmd_list_element *add_alias_cmd (const char *,
                                               cmd_list_element *,
@@ -467,7 +467,7 @@ extern struct cmd_list_element *add_prefix_cmd_suppress_notification
                         const char *doc, struct cmd_list_element **subcommands,
                         int allow_unknown,
                         struct cmd_list_element **list,
-                        int *suppress_notification);
+                        bool *suppress_notification);
 
 extern struct cmd_list_element *add_abbrev_prefix_cmd (const char *,
                                                       enum command_class,
@@ -615,7 +615,7 @@ extern cmd_list_element *add_com_alias (const char *name,
 extern struct cmd_list_element *add_com_suppress_notification
                       (const char *name, enum command_class theclass,
                        cmd_simple_func_ftype *fun, const char *doc,
-                       int *supress_notification);
+                       bool *supress_notification);
 
 extern struct cmd_list_element *add_info (const char *,
                                          cmd_simple_func_ftype *fun,