[PATCH v3 20/29] Remove some globals from windows-nat.c

Tom Tromey
2020-03-13T19:09:03Z

windows-nat.c has a few "count" globals that don't seem to be used.
Possibly they were used for debugging at some point, but they no
longer seem useful to me. Because they get in the way of some code
sharing, this patch removes them.

gdb/ChangeLog
2020-03-13 Tom Tromey <tromey@adacore.com>

* windows-nat.c (exception_count, event_count): Remove.
(handle_exception, get_windows_debug_event)
(do_initial_windows_stuff): Update.
---
gdb/ChangeLog | 6 ++++++
gdb/windows-nat.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 7a68f2d355b..3dc31ebd452 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -247,8 +247,6 @@ static unsigned long cygwin_get_dr7 (void);
static std::vector<windows_thread_info *> thread_list;

/* Counts of things. */
-static int exception_count = 0;
-static int event_count = 0;
static int saw_create;
static int open_process_used = 0;
#ifdef __x86_64__
@@ -1386,7 +1384,6 @@ handle_exception (struct target_waitstatus *ourstatus)
ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
break;
}
- exception_count++;
last_sig = ourstatus->value.sig;
return result;
}
@@ -1737,7 +1734,6 @@ windows_nat_target::get_windows_debug_event (int pid,
if (!(debug_event = wait_for_debug_event (&current_event, 1000)))
goto out;

- event_count++;
continue_status = DBG_CONTINUE;

event_code = current_event.dwDebugEventCode;
@@ -2111,8 +2107,6 @@ do_initial_windows_stuff (struct target_ops *ops, DWORD pid, int attaching)
struct inferior *inf;

last_sig = GDB_SIGNAL_0;
- event_count = 0;
- exception_count = 0;
open_process_used = 0;
debug_registers_changed = 0;
debug_registers_used = 0;
--
2.21.1