OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor reformatting. 

From-SVN: r223544
This commit is contained in:
Arnaud Charlet 2015-05-22 12:40:27 +02:00
parent 65467a8a46
commit 10af62127a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ada/prj-util.adb
View File

@ -804,9 +804,9 @@ package body Prj.Util is
-- Relative_Path --
-------------------
function Relative_Path (Pathname, To : String) return String is
function Relative_Path (Pathname : String; To : String) return String is
function Ensure_Directory (Path : String) return String;
-- Function spec must be commented ???
----------------------
-- Ensure_Directory --
@ -824,6 +824,8 @@ package body Prj.Util is
end if;
end Ensure_Directory;
-- Local variables
Dir_Sep_Map : constant Character_Mapping := To_Mapping ("\", "/");
P : String (1 .. Pathname'Length) := Pathname;
@ -832,6 +834,8 @@ package body Prj.Util is
Pi : Natural; -- common prefix ending
N : Natural := 0;
-- Start of processing for Relative_Path
begin
pragma Assert (Is_Absolute_Path (Pathname));
pragma Assert (Is_Absolute_Path (To));
@ -858,6 +862,7 @@ package body Prj.Util is
-- corresponding number of "..".
N := Count (T (Pi + 1 .. T'Last), "/");
if T (T'Last) /= '/' then
N := N + 1;
end if;
@ -1405,8 +1410,7 @@ package body Prj.Util is
Last := Last - 1;
end loop;
-- If we do not find a separator, we output the maximum length
-- possible.
-- If we do not find a separator, output maximum length possible
if Last < First then
Last := First + Max_Length - Positive (Column);

2
gcc/ada/prj-util.ads
View File

@ -245,7 +245,7 @@ package Prj.Util is
-- are handled. This routine must be called only when the project has
-- been built successfully.
function Relative_Path (Pathname, To : String) return String;
function Relative_Path (Pathname : String; To : String) return String;
-- Returns the relative pathname which corresponds to Pathname when
-- starting from directory to. Both Pathname and To must be absolute paths.