Windows gdb: handle_output_debug_string return type

handle_output_debug_string returns a Windows thread id, so it should
return a DWORD instead of an int.

Approved-By: Tom Tromey <tom@tromey.com>
Change-Id: Icbd071a1a37de8a0fc8918bd13254a8d40311e32

diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index b0e51e93fd00ce5fbe781dac5bfc3d78657b2b1e..902508b0aeac887dd657bb2280ef6842bd69d981 100644 (file)
--- a/gdb/nat/windows-nat.h
+++ b/gdb/nat/windows-nat.h
@@ -202,7 +202,7 @@ struct windows_process_info
      a Cygwin signal.  Otherwise just print the string as a warning.
 
      This function must be supplied by the embedding application.  */
-  virtual int handle_output_debug_string (struct target_waitstatus *ourstatus) = 0;
+  virtual DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) = 0;
 
   /* Handle a DLL load event.
 

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index b9c9c68b4f2540b0ad9aab16fe618a8f77e59164..d48c9b25121b7b78a3cedd97af3fc1e8061ddddd 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -95,7 +95,7 @@ struct windows_per_inferior : public windows_process_info
   windows_thread_info *find_thread (ptid_t ptid) override;
   windows_thread_info *thread_rec (ptid_t ptid,
                                   thread_disposition_type disposition) override;
-  int handle_output_debug_string (struct target_waitstatus *ourstatus) override;
+  DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override;
   void handle_load_dll (const char *dll_name, LPVOID base) override;
   void handle_unload_dll () override;
   bool handle_access_violation (const EXCEPTION_RECORD *rec) override;
@@ -987,11 +987,11 @@ signal_event_command (const char *args, int from_tty)
 
 /* See nat/windows-nat.h.  */
 
-int
+DWORD
 windows_per_inferior::handle_output_debug_string
      (struct target_waitstatus *ourstatus)
 {
-  int retval = 0;
+  DWORD thread_id = 0;
 
   gdb::unique_xmalloc_ptr<char> s
     = (target_read_string
@@ -1032,19 +1032,19 @@ windows_per_inferior::handle_output_debug_string
       if (gotasig)
        {
          ourstatus->set_stopped (gotasig);
-         retval = strtoul (p, &p, 0);
-         if (!retval)
-           retval = current_event.dwThreadId;
+         thread_id = strtoul (p, &p, 0);
+         if (thread_id == 0)
+           thread_id = current_event.dwThreadId;
          else
            x = (LPCVOID) (uintptr_t) strtoull (p, NULL, 0);
        }
 
       DEBUG_EVENTS ("gdb: cygwin signal %d, thread 0x%x, CONTEXT @ %p",
-                   gotasig, retval, x);
+                   gotasig, thread_id, x);
     }
 #endif
 
-  return retval;
+  return thread_id;
 }
 
 static int

diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index ea11c3b77956b024e4edf1e8e1cb29511d6a138d..2bf42f42350c0102ea9e3a4f90cf82ff901fb7b1 100644 (file)
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -619,7 +619,7 @@ win32_process_target::attach (unsigned long pid)
 
 /* See nat/windows-nat.h.  */
 
-int
+DWORD
 gdbserver_windows_process::handle_output_debug_string
      (struct target_waitstatus *ourstatus)
 {

diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index fb757da9718b1c0e5b23eb213b8fea5aaac7fe22..b12c217c406160e2e9d7df7bf43d9d5c7c6f1cc3 100644 (file)
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -185,7 +185,7 @@ struct gdbserver_windows_process : public windows_nat::windows_process_info
   windows_nat::windows_thread_info *thread_rec
        (ptid_t ptid,
        windows_nat::thread_disposition_type disposition) override;
-  int handle_output_debug_string (struct target_waitstatus *ourstatus) override;
+  DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override;
   void handle_load_dll (const char *dll_name, LPVOID base) override;
   void handle_unload_dll () override;
   bool handle_access_violation (const EXCEPTION_RECORD *rec) override;