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

login
register
mail settings
Submitter Simon Marchi (Code Review)
Date Nov. 26, 2019, 5:11 p.m.
Message ID <gerrit.1574788288000.I5e0553eb0627e5e764cc79aced3d451ab88bb04f@gnutoolchain-gerrit.osci.io>
Download mbox | patch
Permalink /patch/36226/
State New
Headers show

Comments

Simon Marchi (Code Review) - Nov. 26, 2019, 5:11 p.m.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/715
......................................................................

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.

gdb/ChangeLog
2019-11-26  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: I5e0553eb0627e5e764cc79aced3d451ab88bb04f
---
M gdb/ChangeLog
M gdb/windows-nat.c
2 files changed, 6 insertions(+), 6 deletions(-)
Simon Marchi (Code Review) - Nov. 29, 2019, 7:56 p.m.
Pedro Alves has posted comments on this change.

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


Patch Set 1: Code-Review+2

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 188da7e..221a6e7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@ 
 2019-11-26  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-11-26  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 caa71dd..c046f91 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;
 
@@ -1234,7 +1232,6 @@ 
       ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
       break;
     }
-  exception_count++;
   last_sig = ourstatus->value.sig;
   return result;
 }
@@ -1519,7 +1516,6 @@ 
   if (!(debug_event = wait_for_debug_event (&current_event, 1000)))
     goto out;
 
-  event_count++;
   continue_status = DBG_CONTINUE;
 
   event_code = current_event.dwDebugEventCode;
@@ -1853,8 +1849,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;