From: Pedro Alves <palves@redhat.com>
Date: Thu, 27 Mar 2014 13:13:59 +0000 (+0000)
Subject: Don't store the inferior's exit code for --return-child-result in a print routine.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98eb56a4bc8a0d3c58ba6f616d6e9238377ecce5;p=binutils-gdb.git

Don't store the inferior's exit code for --return-child-result in a print routine.

A small cleanup - so we can call the print routine without affecting
--return-child-result.

gdb/
2014-05-22  Pedro Alves  <palves@redhat.com>

	* infrun.c (handle_inferior_event): Store the exit code for
	--return-child-result here, instead of ...
	(print_exited_reason): ... here.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f64a48b55d5..4e65bdbdcaa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-22  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (handle_inferior_event): Store the exit code for
+	--return-child-result here, instead of ...
+	(print_exited_reason): ... here.
+
 2014-05-21  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/13860
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 9ec23639509..6d0bfd8c258 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3524,6 +3524,9 @@ handle_inferior_event (struct execution_control_state *ecs)
 	  current_inferior ()->has_exit_code = 1;
 	  current_inferior ()->exit_code = (LONGEST) ecs->ws.value.integer;
 
+	  /* Support the --return-child-result option.  */
+	  return_child_result_value = ecs->ws.value.integer;
+
 	  print_exited_reason (ecs->ws.value.integer);
 	}
       else
@@ -5971,8 +5974,6 @@ print_exited_reason (int exitstatus)
       ui_out_text (uiout, pidstr);
       ui_out_text (uiout, ") exited normally]\n");
     }
-  /* Support the --return-child-result option.  */
-  return_child_result_value = exitstatus;
 }
 
 /* Signal received, print why the inferior has stopped.  The signal table