From 8dd08de7e48850496321548099ef86d3275679b9 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 17 Oct 2022 15:01:24 +0100 Subject: [PATCH] gdb: int to bool conversion for normal_stop Change the return type of normal_stop (infrun.c) from int to bool. Update callers. I've also converted the (void) to () in the function declaration and definition, given I was changing those lines anyway. There should be no user visible changes after this commit. --- gdb/infcmd.c | 4 +--- gdb/infrun.c | 10 +++++----- gdb/infrun.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 0497ad05091..7d5ec77ff57 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -885,12 +885,10 @@ step_1 (int skip_subroutines, int single_inst, const char *count_string) proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); else { - int proceeded; - /* Stepped into an inline frame. Pretend that we've stopped. */ thr->thread_fsm ()->clean_up (thr); - proceeded = normal_stop (); + bool proceeded = normal_stop (); if (!proceeded) inferior_event_handler (INF_EXEC_COMPLETE); all_uis_check_sync_execution_done (); diff --git a/gdb/infrun.c b/gdb/infrun.c index 181d961d80d..1a2ef2d078b 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -4219,7 +4219,7 @@ fetch_inferior_event () else { bool should_notify_stop = true; - int proceeded = 0; + bool proceeded = false; stop_all_threads_if_all_stop_mode (); @@ -8582,8 +8582,8 @@ stop_context::changed () const /* See infrun.h. */ -int -normal_stop (void) +bool +normal_stop () { struct target_waitstatus last; @@ -8742,7 +8742,7 @@ normal_stop (void) the observers would print a stop for the wrong thread/inferior. */ if (saved_context.changed ()) - return 1; + return true; /* Notify observers about the stop. This is where the interpreters print the stop event. */ @@ -8764,7 +8764,7 @@ normal_stop (void) breakpoint_auto_delete (inferior_thread ()->control.stop_bpstat); } - return 0; + return false; } int diff --git a/gdb/infrun.h b/gdb/infrun.h index 19e68155ec4..43fd1b44f5a 100644 --- a/gdb/infrun.h +++ b/gdb/infrun.h @@ -149,7 +149,7 @@ extern process_stratum_target *user_visible_resume_target (ptid_t resume_ptid); appropriate messages, remove breakpoints, give terminal our modes, and run the stop hook. Returns true if the stop hook proceeded the target, false otherwise. */ -extern int normal_stop (void); +extern bool normal_stop (); /* Return the cached copy of the last target/ptid/waitstatus returned by target_wait(). The data is actually cached by handle_inferior_event(), -- 2.30.2