[review] Remove some globals from windows-nat.c

Message ID gerrit.1572371871000.I44f3d150deefc9046ddcdc7321a8989bc4f7a16a@gnutoolchain-gerrit.osci.io
State New, archived
Headers

Commit Message

Simon Marchi (Code Review) Oct. 29, 2019, 5:57 p.m. UTC
  Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/424
......................................................................

Remove some globals from windows-nat.c

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.

Change-Id: I5e0553eb0627e5e764cc79aced3d451ab88bb04f

gdb/ChangeLog
2019-10-29  Tom Tromey  <tromey@adacore.com>

	* windows-nat.c (exception_count, event_count): Remove.
	(handle_exception, get_windows_debug_event)
	(do_initial_windows_stuff): Update.

Change-Id: I44f3d150deefc9046ddcdc7321a8989bc4f7a16a
---
M gdb/ChangeLog
M gdb/windows-nat.c
2 files changed, 6 insertions(+), 6 deletions(-)
  

Comments

Simon Marchi (Code Review) Nov. 19, 2019, 10:41 p.m. UTC | #1
Pedro Alves has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/424
......................................................................


Patch Set 1: Code-Review+2

LGTM.
  

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c8e9228..bf55033 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@ 
 2019-10-29  Tom Tromey  <tromey@adacore.com>
 
+	* windows-nat.c (exception_count, event_count): Remove.
+	(handle_exception, get_windows_debug_event)
+	(do_initial_windows_stuff): Update.
+
+2019-10-29  Tom Tromey  <tromey@adacore.com>
+
 	* windows-nat.c (windows_nat::handle_load_dll)
 	(windows_nat::handle_unload_dll): Rename.  No longer static.
 	* nat/windows-nat.h (handle_load_dll, handle_unload_dll):
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 8bad871..159b093 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -217,8 +217,6 @@ 
 
 
 /* Counts of things.  */
-static int exception_count = 0;
-static int event_count = 0;
 static int saw_create;
 static int open_process_used = 0;
 
@@ -1209,7 +1207,6 @@ 
       ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
       break;
     }
-  exception_count++;
   last_sig = ourstatus->value.sig;
   return result;
 }
@@ -1495,7 +1492,6 @@ 
   if (!(debug_event = wait_for_debug_event (&current_event, 1000)))
     goto out;
 
-  event_count++;
   continue_status = DBG_CONTINUE;
 
   event_code = current_event.dwDebugEventCode;
@@ -1827,8 +1823,6 @@ 
   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;