[1/6] gdb/linux-nat: use get_ptrace_pid in two spots

Message ID 20221202200925.245955-1-simon.marchi@polymtl.ca
State Committed
Commit 0acd1110b69839d484b4b536a24b3477b06d6dfa
Headers
Series [1/6] gdb/linux-nat: use get_ptrace_pid in two spots |

Commit Message

Simon Marchi Dec. 2, 2022, 8:09 p.m. UTC
  No behavior change expected.

Change-Id: Ifaa64ecd619483646b024fd7c62e571e92a8eedb
---
 gdb/linux-nat.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)


base-commit: f9f593ddb2dee399e1ad24370c8e627aa4262524
  

Comments

Tom Tromey Dec. 5, 2022, 8:39 p.m. UTC | #1
Simon> No behavior change expected.

I read through these & they all look good to me.

Tom
  
Simon Marchi Dec. 5, 2022, 9:39 p.m. UTC | #2
On 12/5/22 15:39, Tom Tromey wrote:
> Simon> No behavior change expected.
> 
> I read through these & they all look good to me.
> 
> Tom

Thanks, pushed.

Simon
  

Patch

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 17e5dce08c3d..9ab8b845cbb4 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -3611,20 +3611,16 @@  linux_xfer_siginfo (enum target_object object,
 		    const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
 		    ULONGEST *xfered_len)
 {
-  int pid;
   siginfo_t siginfo;
   gdb_byte inf_siginfo[sizeof (siginfo_t)];
 
   gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
   gdb_assert (readbuf || writebuf);
 
-  pid = inferior_ptid.lwp ();
-  if (pid == 0)
-    pid = inferior_ptid.pid ();
-
   if (offset > sizeof (siginfo))
     return TARGET_XFER_E_IO;
 
+  int pid = get_ptrace_pid (inferior_ptid);
   errno = 0;
   ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, &siginfo);
   if (errno != 0)
@@ -4446,11 +4442,7 @@  linux_nat_target::linux_nat_target ()
 int
 linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo)
 {
-  int pid;
-
-  pid = ptid.lwp ();
-  if (pid == 0)
-    pid = ptid.pid ();
+  int pid = get_ptrace_pid (ptid);
 
   errno = 0;
   ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, siginfo);