aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2012-02-10 14:23:52 +0000
committerPedro Alves <palves@redhat.com>2012-02-10 14:23:52 +0000
commitdb2b9fdd4f883c597bb5707b8a5d6e55d2406323 (patch)
treea8636a93a3580bd028c3fa37530a529b82ec0b55 /gdb
parent12cd34f3ad4fe3d0fd15d0c1dafe9d01c1bfa64c (diff)
downloadgdb-db2b9fdd4f883c597bb5707b8a5d6e55d2406323.zip
gdb-db2b9fdd4f883c597bb5707b8a5d6e55d2406323.tar.gz
gdb-db2b9fdd4f883c597bb5707b8a5d6e55d2406323.tar.bz2
2012-02-10 Pedro Alves <palves@redhat.com>
* inferior.c (inferior_pid_to_str): New. (print_inferior, inferior_command): Use it.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/inferior.c21
2 files changed, 20 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9cf37d5..41c32b9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2012-02-10 Pedro Alves <palves@redhat.com>
+ * inferior.c (inferior_pid_to_str): New.
+ (print_inferior, inferior_command): Use it.
+
+2012-02-10 Pedro Alves <palves@redhat.com>
+
* configure.ac (HAVE_ELF test): Put the old CFLAGS at the end of
the test CFLAGS.
* configure: Regenerate.
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 4df8c77..51748a9 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -526,6 +526,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 +591,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 +709,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>")));