aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorGary Dismukes <dismukes@adacore.com>2019-12-16 10:33:22 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2019-12-16 10:33:22 +0000
commitf17267c88f7c61a0b9395f2fe24b62e2587ab98c (patch)
tree509e4ccae48c49c3bc67f0f994f0240303dbb073 /gcc
parent6a6ac079858f2140567a8640718094213366a05b (diff)
downloadgcc-f17267c88f7c61a0b9395f2fe24b62e2587ab98c.zip
gcc-f17267c88f7c61a0b9395f2fe24b62e2587ab98c.tar.gz
gcc-f17267c88f7c61a0b9395f2fe24b62e2587ab98c.tar.bz2
[Ada] Typo fixes and minor reformatting
2019-12-16 Gary Dismukes <dismukes@adacore.com> gcc/ada/ * libgnat/g-exptty.adb, libgnat/g-exptty.ads: Typo fixes and minor reformatting. From-SVN: r279415
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/libgnat/g-exptty.adb16
-rw-r--r--gcc/ada/libgnat/g-exptty.ads4
3 files changed, 17 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0f843f3..12380b6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-16 Gary Dismukes <dismukes@adacore.com>
+
+ * libgnat/g-exptty.adb, libgnat/g-exptty.ads: Typo fixes and
+ minor reformatting.
+
2019-12-16 Eric Botcazou <ebotcazou@adacore.com>
* exp_ch6.adb (Requires_Atomic_Or_Volatile_Copy): New predicate.
diff --git a/gcc/ada/libgnat/g-exptty.adb b/gcc/ada/libgnat/g-exptty.adb
index b193448..758be7a 100644
--- a/gcc/ada/libgnat/g-exptty.adb
+++ b/gcc/ada/libgnat/g-exptty.adb
@@ -38,8 +38,9 @@ package body GNAT.Expect.TTY is
On_Windows : constant Boolean := Directory_Separator = '\';
-- True when on Windows
- function Waitpid (Process : System.Address; Blocking : Integer)
- return Integer;
+ function Waitpid
+ (Process : System.Address;
+ Blocking : Integer) return Integer;
pragma Import (C, Waitpid, "__gnat_tty_waitpid");
-- Wait for a specific process id, and return its exit code
@@ -48,8 +49,7 @@ package body GNAT.Expect.TTY is
------------------------
function Is_Process_Running
- (Descriptor : in out TTY_Process_Descriptor)
- return Boolean
+ (Descriptor : in out TTY_Process_Descriptor) return Boolean
is
begin
if Descriptor.Process = System.Null_Address then
@@ -57,6 +57,7 @@ package body GNAT.Expect.TTY is
end if;
Descriptor.Exit_Status := Waitpid (Descriptor.Process, Blocking => 0);
+
return Descriptor.Exit_Status = Still_Active;
end Is_Process_Running;
@@ -106,17 +107,20 @@ package body GNAT.Expect.TTY is
Status := Waitpid (Descriptor.Process, Blocking => 0);
if Status = Still_Active then
- -- In theory the process might hav died since the check. In
+ -- In theory the process might have died since the check. In
-- practice the following calls should not cause any issue.
+
Interrupt (Descriptor);
delay (0.05);
Terminate_Process (Descriptor.Process);
Status := Waitpid (Descriptor.Process, Blocking => 1);
Descriptor.Exit_Status := Status;
end if;
+
else
-- If Exit_Status is not STILL_ACTIVE just retrieve the saved
- -- exit status
+ -- exit status.
+
Status := Descriptor.Exit_Status;
end if;
diff --git a/gcc/ada/libgnat/g-exptty.ads b/gcc/ada/libgnat/g-exptty.ads
index f61ea62..683a453 100644
--- a/gcc/ada/libgnat/g-exptty.ads
+++ b/gcc/ada/libgnat/g-exptty.ads
@@ -95,7 +95,7 @@ package GNAT.Expect.TTY is
function Is_Process_Running
(Descriptor : in out TTY_Process_Descriptor)
return Boolean;
- -- Return True is the process is still alive
+ -- Returns True if the process is still alive
private
@@ -142,7 +142,7 @@ private
Process : System.Address := System.Null_Address;
-- Underlying structure used in C
Exit_Status : Integer := Still_Active;
- -- Hold the exit status of the process.
+ -- Holds the exit status of the process
Use_Pipes : Boolean := True;
end record;