From 263cb16b7667ba92fbac3098375aecfb7f80105e Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Sat, 26 Mar 2022 00:11:35 +0100 Subject: [PATCH] [Ada] Simplify construction of a path to file Code cleanup; semantics is unaffected. gcc/ada/ * osint.adb (Locate_File): Change variable to constant and initialize it by concatenation of directory, file name and NUL. --- gcc/ada/osint.adb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb index a38ad78..eeedfcb 100644 --- a/gcc/ada/osint.adb +++ b/gcc/ada/osint.adb @@ -1886,13 +1886,13 @@ package body Osint is end if; declare - Full_Name : String (1 .. Dir_Name'Length + Name'Length + 1); + Full_Name : + constant String (1 .. Dir_Name'Length + Name'Length + 1) := + Dir_Name.all & Name & ASCII.NUL; + -- Use explicit bounds, because Dir_Name might be a substring whose + -- 'First is not 1. begin - Full_Name (1 .. Dir_Name'Length) := Dir_Name.all; - Full_Name (Dir_Name'Length + 1 .. Full_Name'Last - 1) := Name; - Full_Name (Full_Name'Last) := ASCII.NUL; - Attr.all := Unknown_Attributes; if not Is_Regular_File (Full_Name'Address, Attr) then -- 2.7.4