From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 004B23856DE6 for ; Wed, 6 Jul 2022 13:31:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 004B23856DE6 Received: by mail-wr1-x42f.google.com with SMTP id v14so22105033wra.5 for ; Wed, 06 Jul 2022 06:31:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=LrEI9PTbe3FmFSScfkzbgpypuj2TCVgVGrE8GcGPcog=; b=hGFPbRijrllZYN8/uVieDZtz4WoHJCnN/9G7NYWrPGFn/OrujPLiMRaSGMwW9T8xNs L7JMFIxVOQ3aswLQsvorNgkoLXZ/VXTed0onDjANxBCkLsazeJu1dnpjkhQG5QyZkeLz DASaR8GNPxNmeL7vlwdcdsxEQnkSyCXOcbV8GBEzntDxOHtuKrUndPft0gZFhx9E+YqR 5L6YLwcb793v4iDy4q0RWzbzoMy2OjpWcYs3QucH+ab/umrjcsppQWSE8a5BHQH05XRL hL8iXdkS9R8WQ0SLSOT+M0XTySRlk9WBDzKHXkJMWMS1i2yUQYTPtQVzyzI5ukwDuUE7 i2Yg== X-Gm-Message-State: AJIora9JlVVogoPHA6PWY8eXF28Bwtul0K0B6xaBdDLTBwsYxWniQOwX f0BJekv9KdsTUGMq1xLjgA5VnJHLMFHgew== X-Google-Smtp-Source: AGRyM1sBuZTHwFbI7HxfW0rCw/e29OgqrA+WqNeYMs4QJAE41hwa/Gbh6LgIlOSnQx0xMGIZ4rHtcw== X-Received: by 2002:a05:6000:ca:b0:21b:8082:7518 with SMTP id q10-20020a05600000ca00b0021b80827518mr36204434wrx.124.1657114285773; Wed, 06 Jul 2022 06:31:25 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id m1-20020a7bcb81000000b003a05621dc53sm25658847wmi.29.2022.07.06.06.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 06:31:25 -0700 (PDT) Date: Wed, 6 Jul 2022 13:31:24 +0000 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Cleanup use of local scalars in GNAT.Socket.Get_Address_Info Message-ID: <20220706133124.GA2203639@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MGYHOYXEY6WxJCY8" Content-Disposition: inline X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2022 13:31:28 -0000 --MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline A cleanup opportunity spotted while working on improved detection of uninitialised local scalar objects. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/g-socket.adb (Get_Address_Info): Reduce scope of the Found variable; avoid repeated assignment inside the loop. --MGYHOYXEY6WxJCY8 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/libgnat/g-socket.adb b/gcc/ada/libgnat/g-socket.adb --- a/gcc/ada/libgnat/g-socket.adb +++ b/gcc/ada/libgnat/g-socket.adb @@ -1036,7 +1036,6 @@ package body GNAT.Sockets is R : C.int; Iter : Addrinfo_Access; - Found : Boolean; function To_Array return Address_Info_Array; -- Convert taken from OS addrinfo list A into Address_Info_Array @@ -1046,8 +1045,6 @@ package body GNAT.Sockets is -------------- function To_Array return Address_Info_Array is - Result : Address_Info_Array (1 .. 8); - procedure Unsupported; -- Calls Unknown callback if defiend @@ -1066,6 +1063,9 @@ package body GNAT.Sockets is end if; end Unsupported; + Found : Boolean; + Result : Address_Info_Array (1 .. 8); + -- Start of processing for To_Array begin @@ -1087,8 +1087,8 @@ package body GNAT.Sockets is if Result (J).Addr.Family = Family_Unspec then Unsupported; else + Found := False; for M in Modes'Range loop - Found := False; if Modes (M) = Iter.ai_socktype then Result (J).Mode := M; Found := True; --MGYHOYXEY6WxJCY8--