Commit 07736171 by Arnaud Charlet

a-ststio.adb, [...]: Further code clean up of previous change.

	* a-ststio.adb, s-direio.adb: Further code clean up of previous change.
	Update comments.

From-SVN: r136023
parent d5c998a9
...@@ -101,11 +101,8 @@ package body Ada.Streams.Stream_IO is ...@@ -101,11 +101,8 @@ package body Ada.Streams.Stream_IO is
----------- -----------
procedure Close (File : in out File_Type) is procedure Close (File : in out File_Type) is
AFCB : aliased AP;
for AFCB'Address use File'Address;
pragma Import (Ada, AFCB);
begin begin
FIO.Close (AFCB'Access); FIO.Close (AP (File)'Unrestricted_Access);
end Close; end Close;
------------ ------------
...@@ -140,11 +137,8 @@ package body Ada.Streams.Stream_IO is ...@@ -140,11 +137,8 @@ package body Ada.Streams.Stream_IO is
------------ ------------
procedure Delete (File : in out File_Type) is procedure Delete (File : in out File_Type) is
AFCB : aliased AP;
for AFCB'Address use File'Address;
pragma Import (Ada, AFCB);
begin begin
FIO.Delete (AFCB'Access); FIO.Delete (AP (File)'Unrestricted_Access);
end Delete; end Delete;
----------------- -----------------
...@@ -357,9 +351,6 @@ package body Ada.Streams.Stream_IO is ...@@ -357,9 +351,6 @@ package body Ada.Streams.Stream_IO is
-------------- --------------
procedure Set_Mode (File : in out File_Type; Mode : File_Mode) is procedure Set_Mode (File : in out File_Type; Mode : File_Mode) is
AFCB : aliased AP;
for AFCB'Address use File'Address;
pragma Import (Ada, AFCB);
begin begin
FIO.Check_File_Open (AP (File)); FIO.Check_File_Open (AP (File));
...@@ -371,7 +362,7 @@ package body Ada.Streams.Stream_IO is ...@@ -371,7 +362,7 @@ package body Ada.Streams.Stream_IO is
if ((File.Mode = FCB.In_File) /= (Mode = In_File)) if ((File.Mode = FCB.In_File) /= (Mode = In_File))
and then not File.Update_Mode and then not File.Update_Mode
then then
FIO.Reset (AFCB'Access, FCB.Inout_File); FIO.Reset (AP (File)'Unrestricted_Access, FCB.Inout_File);
File.Update_Mode := True; File.Update_Mode := True;
end if; end if;
......
...@@ -252,6 +252,9 @@ package body System.Direct_IO is ...@@ -252,6 +252,9 @@ package body System.Direct_IO is
procedure Reset (File : in out File_Type; Mode : FCB.File_Mode) is procedure Reset (File : in out File_Type; Mode : FCB.File_Mode) is
pragma Unmodified (File); pragma Unmodified (File);
-- File is actually modified via Unrestricted_Access below, but
-- GNAT will generate a warning anyway.
begin begin
FIO.Reset (AP (File)'Unrestricted_Access, Mode); FIO.Reset (AP (File)'Unrestricted_Access, Mode);
File.Index := 1; File.Index := 1;
...@@ -260,6 +263,9 @@ package body System.Direct_IO is ...@@ -260,6 +263,9 @@ package body System.Direct_IO is
procedure Reset (File : in out File_Type) is procedure Reset (File : in out File_Type) is
pragma Unmodified (File); pragma Unmodified (File);
-- File is actually modified via Unrestricted_Access below, but
-- GNAT will generate a warning anyway.
begin begin
FIO.Reset (AP (File)'Unrestricted_Access); FIO.Reset (AP (File)'Unrestricted_Access);
File.Index := 1; File.Index := 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment