* dwarf2read.c (dwarf2_get_pc_bounds): Check DW_AT_high_pc form to

[deliverable/binutils-gdb.git] / gdb / inferior.c

diff --git a/gdb/inferior.c b/gdb/inferior.c
index 4df8c77462749993ffaeab9fe981647192e65e8a..00f6fa3384b2cc38f370463f31c050a650b7ac4a 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -178,25 +178,6 @@ delete_thread_of_inferior (struct thread_info *tp, void *data)
   return 0;
 }
 
-void
-delete_threads_of_inferior (int pid)
-{
-  struct inferior *inf;
-  struct delete_thread_of_inferior_arg arg;
-
-  for (inf = inferior_list; inf; inf = inf->next)
-    if (inf->pid == pid)
-      break;
-
-  if (!inf)
-    return;
-
-  arg.pid = pid;
-  arg.silent = 1;
-
-  iterate_over_threads (delete_thread_of_inferior, &arg);
-}
-
 /* If SILENT then be quiet -- don't announce a inferior death, or the
    exit of its threads.  */
 
@@ -526,6 +507,18 @@ number_of_inferiors (void)
   return count;
 }
 
+/* Converts an inferior process id to a string.  Like
+   target_pid_to_str, but special cases the null process.  */
+
+static char *
+inferior_pid_to_str (int pid)
+{
+  if (pid != 0)
+    return target_pid_to_str (pid_to_ptid (pid));
+  else
+    return _("<null>");
+}
+
 /* Prints the list of inferiors and their details on UIOUT.  This is a
    version of 'info_inferior_command' suitable for use from MI.
 
@@ -579,11 +572,8 @@ print_inferior (struct ui_out *uiout, char *requested_inferiors)
 
       ui_out_field_int (uiout, "number", inf->num);
 
-      if (inf->pid)
-       ui_out_field_string (uiout, "target-id",
-                            target_pid_to_str (pid_to_ptid (inf->pid)));
-      else
-       ui_out_field_string (uiout, "target-id", "<null>");
+      ui_out_field_string (uiout, "target-id",
+                          inferior_pid_to_str (inf->pid));
 
       if (inf->pspace->ebfd)
        ui_out_field_string (uiout, "exec",
@@ -700,7 +690,7 @@ inferior_command (char *args, int from_tty)
 
   printf_filtered (_("[Switching to inferior %d [%s] (%s)]\n"),
                   inf->num,
-                  target_pid_to_str (pid_to_ptid (inf->pid)),
+                  inferior_pid_to_str (inf->pid),
                   (inf->pspace->ebfd
                    ? bfd_get_filename (inf->pspace->ebfd)
                    : _("<noexec>")));
@@ -751,7 +741,7 @@ info_inferiors_command (char *args, int from_tty)
 
 /* remove-inferior ID */
 
-void
+static void
 remove_inferior_command (char *args, int from_tty)
 {
   int num;
@@ -810,7 +800,7 @@ add_inferior_with_spaces (void)
 
 /* add-inferior [-copies N] [-exec FILENAME]  */
 
-void
+static void
 add_inferior_command (char *args, int from_tty)
 {
   int i, copies = 1;
@@ -873,7 +863,7 @@ add_inferior_command (char *args, int from_tty)
 
 /* clone-inferior [-copies N] [ID] */
 
-void
+static void
 clone_inferior_command (char *args, int from_tty)
 {
   int i, copies = 1;