diff mbox series

[2/7] gdb: change return type of check_quit_flag to bool

Message ID 20240423132517.2625632-3-simon.marchi@polymtl.ca
State New
Headers
Series More cleanup of defs.h |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 fail Patch failed to apply

Commit Message

Simon Marchi April 23, 2024, 1:22 p.m. UTC 
  Change the return type of the check_quit_flag function to bool.  Update
a few related spots.

Change-Id: I9d3a15d3f8651efb02c7d211f06222a592bd4184
---
 gdb/extension-priv.h |  4 ++--
 gdb/extension.c      | 10 +++++-----
 gdb/extension.h      |  2 +-
 gdb/python/python.c  |  6 +++---
 gdb/remote-fileio.c  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

Comments

Alexandra Petlanova Hajkova April 27, 2024, 9:01 a.m. UTC | #1 
On Tue, Apr 23, 2024 at 3:26 PM Simon Marchi <simon.marchi@polymtl.ca>
wrote:

> Change the return type of the check_quit_flag function to bool.  Update
> a few related spots.
>
> Change-Id: I9d3a15d3f8651efb02c7d211f06222a592bd4184
> ---
>
> A reasonable change. Does not add any regressions for Fedora Rawhide on
aarch64 .
diff mbox series

Patch

diff --git a/gdb/extension-priv.h b/gdb/extension-priv.h
index cb00cb6ff7b9..1365988b40dd 100644
--- a/gdb/extension-priv.h
+++ b/gdb/extension-priv.h
@@ -229,9 +229,9 @@  struct extension_language_ops
      This is called by GDB's SIGINT handler and must be async-safe.  */
   void (*set_quit_flag) (const struct extension_language_defn *);
 
-  /* Return non-zero if a SIGINT has occurred.
+  /* Return true if a SIGINT has occurred.
      This is expected to also clear the indicator.  */
-  int (*check_quit_flag) (const struct extension_language_defn *);
+  bool (*check_quit_flag) (const struct extension_language_defn *);
 
   /* Called before gdb prints its prompt, giving extension languages an
      opportunity to change it with set_prompt.
diff --git a/gdb/extension.c b/gdb/extension.c
index 2d692d054315..82d37fb09aea 100644
--- a/gdb/extension.c
+++ b/gdb/extension.c
@@ -890,21 +890,21 @@  set_quit_flag ()
 
 /* See extension.h.  */
 
-int
+bool
 check_quit_flag ()
 {
 #if CXX_STD_THREAD
   std::lock_guard guard (ext_lang_mutex);
 #endif /* CXX_STD_THREAD */
 
-  int result = 0;
+  bool result = false;
 
   for (const struct extension_language_defn *extlang : extension_languages)
     {
       if (extlang->ops != nullptr
 	  && extlang->ops->check_quit_flag != NULL)
-	if (extlang->ops->check_quit_flag (extlang) != 0)
-	  result = 1;
+	if (extlang->ops->check_quit_flag (extlang))
+	  result = true;
     }
 
   /* This is written in a particular way to avoid races.  */
@@ -915,7 +915,7 @@  check_quit_flag ()
 	 request.  */
       quit_serial_event_clear ();
       quit_flag = 0;
-      result = 1;
+      result = true;
     }
 
   return result;
diff --git a/gdb/extension.h b/gdb/extension.h
index 94a500d74586..258a77dbfccb 100644
--- a/gdb/extension.h
+++ b/gdb/extension.h
@@ -447,7 +447,7 @@  class scoped_disable_cooperative_sigint_handling
    The flag is checked in all extension languages that support cooperative
    SIGINT handling, not just the current one.  This simplifies transitions.  */
 
-extern int check_quit_flag ();
+extern bool check_quit_flag ();
 
 /* Set the quit flag.
    This only sets the flag in the currently active extension language.
diff --git a/gdb/python/python.c b/gdb/python/python.c
index d6e5883476e1..a6875af63db7 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -121,7 +121,7 @@  static enum ext_lang_rc gdbpy_apply_type_printers
 static void gdbpy_free_type_printers (const struct extension_language_defn *,
 				      struct ext_lang_type_printers *);
 static void gdbpy_set_quit_flag (const struct extension_language_defn *);
-static int gdbpy_check_quit_flag (const struct extension_language_defn *);
+static bool gdbpy_check_quit_flag (const struct extension_language_defn *);
 static enum ext_lang_rc gdbpy_before_prompt_hook
   (const struct extension_language_defn *, const char *current_gdb_prompt);
 static std::optional<std::string> gdbpy_colorize
@@ -275,11 +275,11 @@  gdbpy_set_quit_flag (const struct extension_language_defn *extlang)
 
 /* Return true if the quit flag has been set, false otherwise.  */
 
-static int
+static bool
 gdbpy_check_quit_flag (const struct extension_language_defn *extlang)
 {
   if (!gdb_python_initialized)
-    return 0;
+    return false;
 
   gdbpy_gil gil;
   return PyOS_InterruptOccurred ();
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 9615dedaebd5..934ba3f8281d 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -316,7 +316,7 @@  static void
 remote_fileio_reply (remote_target *remote, int retcode, int error)
 {
   char buf[32];
-  int ctrl_c = check_quit_flag ();
+  bool ctrl_c = check_quit_flag ();
 
   strcpy (buf, "F");
   if (retcode < 0)