gdb:

	Global renaming of find_thread_pid to find_thread_ptid.
	* gdbthread.h (find_thread_ptid): Renamed from find_thread_pid.
	* thread.c (find_thread_ptid): Renamed from find_thread_pid.
	All callers updated.
gdbserver:
	Global renaming of find_thread_pid to find_thread_ptid.
	* server.h (find_thread_ptid): Renamed from find_thread_pid.
	* inferiors.c (find_thread_ptid): Renamed from find_thread_pid.
	All callers updated.

6 files changed, 13 insertions, 8 deletions

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 472fc00..25bf311 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-24  Doug Evans  <dje@google.com>
 
+	Global renaming of find_thread_pid to find_thread_ptid.
+	* server.h (find_thread_ptid): Renamed from find_thread_pid.
+	* inferiors.c (find_thread_ptid): Renamed from find_thread_pid.
+	All callers updated.
+
 	* linux-low.c (handle_extended_wait): Use linux_resume_one_lwp
 	to resume the newly created thread, don't call ptrace (PTRACE_CONT)
 	directly.
diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index 8111e28..7f15704 100644
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -210,7 +210,7 @@ thread_to_gdb_id (struct thread_info *thread)
 }
 
 struct thread_info *
-find_thread_pid (ptid_t ptid)
+find_thread_ptid (ptid_t ptid)
 {
   struct inferior_list_entry *inf = all_threads.head;
 
@@ -228,7 +228,7 @@ find_thread_pid (ptid_t ptid)
 ptid_t
 gdb_id_to_thread_id (ptid_t gdb_id)
 {
-  struct thread_info *thread = find_thread_pid (gdb_id);
+  struct thread_info *thread = find_thread_ptid (gdb_id);
 
   return thread ? thread->entry.id : null_ptid;
 }
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 92794a8..c4a8fb5 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -1091,7 +1091,7 @@ prepare_resume_reply (char *buf, ptid_t ptid,
 
 	saved_inferior = current_inferior;
 
-	current_inferior = find_thread_pid (ptid);
+	current_inferior = find_thread_ptid (ptid);
 
 	if (the_target->stopped_by_watchpoint != NULL
 	    && (*the_target->stopped_by_watchpoint) ())
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 24b1630..423427c 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1156,7 +1156,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
 	err = 1;
       else
 	{
-	  struct thread_info *thread = find_thread_pid (ptid);
+	  struct thread_info *thread = find_thread_ptid (ptid);
 
 	  if (thread == NULL)
 	    err = 2;
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 5138f1a..89ffeb7 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -239,7 +239,7 @@ struct process_info *find_process_pid (int pid);
 int have_started_inferiors_p (void);
 int have_attached_inferiors_p (void);
 
-struct thread_info *find_thread_pid (ptid_t ptid);
+struct thread_info *find_thread_ptid (ptid_t ptid);
 
 ptid_t thread_id_to_gdb_id (ptid_t);
 ptid_t thread_to_gdb_id (struct thread_info *);
diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
index bbfb5fd..b8ad9eb 100644
--- a/gdb/gdbserver/target.c
+++ b/gdb/gdbserver/target.c
@@ -29,7 +29,7 @@ set_desired_inferior (int use_general)
   struct thread_info *found;
 
   if (use_general == 1)
-    found = find_thread_pid (general_thread);
+    found = find_thread_ptid (general_thread);
   else
     {
       found = NULL;
@@ -41,10 +41,10 @@ set_desired_inferior (int use_general)
 	   && !ptid_equal (step_thread, minus_one_ptid))
 	  && (ptid_equal (cont_thread, null_ptid)
 	      || ptid_equal (cont_thread, minus_one_ptid)))
-	found = find_thread_pid (step_thread);
+	found = find_thread_ptid (step_thread);
 
       if (found == NULL)
-	found = find_thread_pid (cont_thread);
+	found = find_thread_ptid (cont_thread);
     }
 
   if (found == NULL)