[PATCH] gdb: remove duplicate declaration of 'find_thread_ptid'

[PATCH] gdb: remove duplicate declaration of 'find_thread_ptid'

[Tankut Baris Aktemur]

There are two declarations of 'find_thread_ptid' in gdbthread.h
with the same signature:

  extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);

Remove the newer declaration, retain the older one.  Tested by rebuilding.

gdb/ChangeLog:
2021-06-28  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	* gdbthread.h (find_thread_ptid): Remove the duplicate declaration.
---
 gdb/gdbthread.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index eef37f79e6a..2780656f973 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -472,9 +472,6 @@ extern bool in_thread_list (process_stratum_target *targ, ptid_t ptid);
    global id, not the system's).  */
 extern int valid_global_thread_id (int global_id);
 
-/* Find (non-exited) thread PTID of inferior INF.  */
-extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
-
 /* Search function to lookup a (non-exited) thread by 'ptid'.  */
 extern struct thread_info *find_thread_ptid (process_stratum_target *targ,
 					     ptid_t ptid);
-- 
2.17.1

Re: [PATCH] gdb: remove duplicate declaration of 'find_thread_ptid'

[Simon Marchi]

On 2021-06-28 11:11 a.m., Tankut Baris Aktemur via Gdb-patches wrote:
> There are two declarations of 'find_thread_ptid' in gdbthread.h
> with the same signature:
> 
>   extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
> 
> Remove the newer declaration, retain the older one.  Tested by rebuilding.
> 
> gdb/ChangeLog:
> 2021-06-28  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
> 
> 	* gdbthread.h (find_thread_ptid): Remove the duplicate declaration.
> ---
>  gdb/gdbthread.h | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
> index eef37f79e6a..2780656f973 100644
> --- a/gdb/gdbthread.h
> +++ b/gdb/gdbthread.h
> @@ -472,9 +472,6 @@ extern bool in_thread_list (process_stratum_target *targ, ptid_t ptid);
>     global id, not the system's).  */
>  extern int valid_global_thread_id (int global_id);
>  
> -/* Find (non-exited) thread PTID of inferior INF.  */
> -extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
> -
>  /* Search function to lookup a (non-exited) thread by 'ptid'.  */
>  extern struct thread_info *find_thread_ptid (process_stratum_target *targ,
>  					     ptid_t ptid);
> 

Thanks, that could count as trivial.

But since I'm here: I prefer the comment that you removed over the one
you left.  It's more concise and straight to the point, to say the same
thing.

Ok to push in any case.

Simon

Re: [PATCH] gdb: remove duplicate declaration of 'find_thread_ptid'

[Andrew Burgess]

* Tankut Baris Aktemur via Gdb-patches <gdb-patches@sourceware.org> [2021-06-28 17:11:11 +0200]:

> There are two declarations of 'find_thread_ptid' in gdbthread.h
> with the same signature:
> 
>   extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
> 
> Remove the newer declaration, retain the older one.  Tested by rebuilding.
> 
> gdb/ChangeLog:
> 2021-06-28  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
> 
> 	* gdbthread.h (find_thread_ptid): Remove the duplicate
> 	* declaration.

LGTM.

Thanks,
Andrew


> ---
>  gdb/gdbthread.h | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
> index eef37f79e6a..2780656f973 100644
> --- a/gdb/gdbthread.h
> +++ b/gdb/gdbthread.h
> @@ -472,9 +472,6 @@ extern bool in_thread_list (process_stratum_target *targ, ptid_t ptid);
>     global id, not the system's).  */
>  extern int valid_global_thread_id (int global_id);
>  
> -/* Find (non-exited) thread PTID of inferior INF.  */
> -extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
> -
>  /* Search function to lookup a (non-exited) thread by 'ptid'.  */
>  extern struct thread_info *find_thread_ptid (process_stratum_target *targ,
>  					     ptid_t ptid);
> -- 
> 2.17.1
> 

RE: [PATCH] gdb: remove duplicate declaration of 'find_thread_ptid'

[Aktemur, Tankut Baris]

On Monday, June 28, 2021 7:47 PM, Simon Marchi wrote:
> On 2021-06-28 11:11 a.m., Tankut Baris Aktemur via Gdb-patches wrote:
> > There are two declarations of 'find_thread_ptid' in gdbthread.h
> > with the same signature:
> >
> >   extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
> >
> > Remove the newer declaration, retain the older one.  Tested by rebuilding.
> >
> > gdb/ChangeLog:
> > 2021-06-28  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
> >
> > 	* gdbthread.h (find_thread_ptid): Remove the duplicate declaration.
> > ---
> >  gdb/gdbthread.h | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
> > index eef37f79e6a..2780656f973 100644
> > --- a/gdb/gdbthread.h
> > +++ b/gdb/gdbthread.h
> > @@ -472,9 +472,6 @@ extern bool in_thread_list (process_stratum_target *targ, ptid_t
> ptid);
> >     global id, not the system's).  */
> >  extern int valid_global_thread_id (int global_id);
> >
> > -/* Find (non-exited) thread PTID of inferior INF.  */
> > -extern thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
> > -
> >  /* Search function to lookup a (non-exited) thread by 'ptid'.  */
> >  extern struct thread_info *find_thread_ptid (process_stratum_target *targ,
> >  					     ptid_t ptid);
> >
> 
> Thanks, that could count as trivial.
> 
> But since I'm here: I prefer the comment that you removed over the one
> you left.  It's more concise and straight to the point, to say the same
> thing.
> 
> Ok to push in any case.
> 
> Simon

I pushed the version you suggested, because as a bonus it also removed the
declaration with the redundant 'struct' keyword.

Thanks.
-Baris


Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva  
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928