From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 2106E3858D39 for ; Fri, 2 Dec 2022 20:09:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2106E3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2K9RqB018577 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:09:32 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2K9RqB018577 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1670011772; bh=bqY5D4Vb0k6nTEHS/PVi43RGFL2B2haWCyY8p+Pl9E4=; h=From:To:Cc:Subject:Date:From; b=koWEUPZboe+ADmJOX2IOhbgzRKkt9HrwN882LulfZVdjS2hstXlujG76yYM5xhrkf Ex41v3BRlC5SIk6+8zglc7iRMMgoTICPGO6Vgqtp32CcuKdraBshN5ItLtjlQaAMAc 5ljrkG9LTazAInsOQjbjIgoYnGm59jhkm4HZ1RDo= Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 5F3821E112; Fri, 2 Dec 2022 15:09:27 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/6] gdb/linux-nat: use get_ptrace_pid in two spots Date: Fri, 2 Dec 2022 15:09:20 -0500 Message-Id: <20221202200925.245955-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:09:27 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: No behavior change expected. Change-Id: Ifaa64ecd619483646b024fd7c62e571e92a8eedb --- gdb/linux-nat.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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); base-commit: f9f593ddb2dee399e1ad24370c8e627aa4262524 -- 2.38.1