From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id F317F3815FFB; Mon, 30 May 2022 08:31:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F317F3815FFB MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-848] [Ada] Simplify construction of a path to file X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 0f29dfcec26d883cb2d3d7ccdfc09bde1afcfa2e X-Git-Newrev: 263cb16b7667ba92fbac3098375aecfb7f80105e Message-Id: <20220530083148.F317F3815FFB@sourceware.org> Date: Mon, 30 May 2022 08:31:48 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2022 08:31:49 -0000 https://gcc.gnu.org/g:263cb16b7667ba92fbac3098375aecfb7f80105e commit r13-848-g263cb16b7667ba92fbac3098375aecfb7f80105e Author: Piotr Trojanek Date: Sat Mar 26 00:11:35 2022 +0100 [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. Diff: --- 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 a38ad7874e3..eeedfcbc3ae 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