osint.adb, [...]: Minor reformatting.

2009-11-30  Robert Dewar  <dewar@adacore.com>

	* osint.adb, a-rttiev.adb: Minor reformatting.

From-SVN: r154808

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fb729dcd9f036401b4fba7e528bf1a0478ceca45..8900a23ac5ba65894e81af59a2d2181b2e598e98 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-30  Robert Dewar  <dewar@adacore.com>
+
+       * osint.adb, a-rttiev.adb: Minor reformatting.
+
 2009-11-30  Robert Dewar  <dewar@adacore.com>
 
        * gnat_rm.texi: Remove list of warning letters, and refer instead to

diff --git a/gcc/ada/a-rttiev.adb b/gcc/ada/a-rttiev.adb
index 55687ec8f6beb57f04c1d23cf9d65b22e2dcf84e..2fe78212c3da9ec2ab76140fddf6d36ea4c9ac87 100644 (file)
--- a/gcc/ada/a-rttiev.adb
+++ b/gcc/ada/a-rttiev.adb
@@ -75,9 +75,9 @@ package body Ada.Real_Time.Timing_Events is
    --  with mutually exclusive access via Event_Queue_Lock.
 
    procedure Remove_From_Queue (This : Any_Timing_Event);
-   --  Remove the specified event pointer from the queue of pending events
-   --  with mutually exclusive access via Event_Queue_Lock.
-   --  This procedure is used by the client-side routines (Set_Handler, etc.).
+   --  Remove the specified event pointer from the queue of pending events with
+   --  mutually exclusive access via Event_Queue_Lock. This procedure is used
+   --  by the client-side routines (Set_Handler, etc.).
 
    -----------
    -- Timer --
@@ -94,6 +94,7 @@ package body Ada.Real_Time.Timing_Events is
       --  selected is arbitrary and could be changed to suit the application
       --  requirements. Obviously a shorter period would give better resolution
       --  at the cost of more overhead.
+
    begin
       System.Tasking.Utilities.Make_Independent;
 
@@ -171,6 +172,7 @@ package body Ada.Real_Time.Timing_Events is
 
          declare
             Handler : constant Timing_Event_Handler := Next_Event.Handler;
+
          begin
             --  The first act is to clear the event, per D.15(13/2). Besides,
             --  we cannot clear the handler pointer *after* invoking the
@@ -205,11 +207,17 @@ package body Ada.Real_Time.Timing_Events is
       package By_Timeout is new Events.Generic_Sorting (Sooner);
       --  Used to keep the events in ascending order by timeout value
 
+      ------------
+      -- Sooner --
+      ------------
+
       function Sooner (Left, Right : Any_Timing_Event) return Boolean is
       begin
          return Left.Timeout < Right.Timeout;
       end Sooner;
 
+   --  Start of processing for Insert_Into_Queue
+
    begin
       SSL.Abort_Defer.all;
 
@@ -236,12 +244,14 @@ package body Ada.Real_Time.Timing_Events is
    procedure Remove_From_Queue (This : Any_Timing_Event) is
       use Events;
       Location : Cursor;
+
    begin
       SSL.Abort_Defer.all;
 
       Write_Lock (Event_Queue_Lock'Access);
 
       Location := All_Events.Find (This);
+
       if Location /= No_Element then
          All_Events.Delete (Location);
       end if;
@@ -332,13 +342,9 @@ package body Ada.Real_Time.Timing_Events is
 
    function Time_Of_Event (Event : Timing_Event) return Time is
    begin
-      --  RM D.15(18/2): Time_First must be returned if the event is not set
+      --  RM D.15(18/2): Time_First must be returned in the event is not set
 
-      if Event.Handler = null then
-         return Time_First;
-      else
-         return Event.Timeout;
-      end if;
+      return (if Event.Handler = null then Time_First else Event.Timeout);
    end Time_Of_Event;
 
    --------------

diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb
index 510e1e94ed1d078068f78c5c5672d81548203680..6265ede68d135d4be91c1ac9798b95e9dbb85fc2 100644 (file)
--- a/gcc/ada/osint.adb
+++ b/gcc/ada/osint.adb
@@ -1081,7 +1081,8 @@ package body Osint is
 
    function File_Time_Stamp
      (Name : Path_Name_Type;
-      Attr : access File_Attributes) return Time_Stamp_Type is
+      Attr : access File_Attributes) return Time_Stamp_Type
+   is
    begin
       if Name = No_Path then
          return Empty_Time_Stamp;
@@ -1090,7 +1091,7 @@ package body Osint is
       Get_Name_String (Name);
       Name_Buffer (Name_Len + 1) := ASCII.NUL;
       return OS_Time_To_GNAT_Time
-        (File_Time_Stamp (Name_Buffer'Address, Attr));
+               (File_Time_Stamp (Name_Buffer'Address, Attr));
    end File_Time_Stamp;
 
    ----------------