From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from re-prd-fep-041.btinternet.com (mailomta5-re.btinternet.com [213.120.69.98]) by sourceware.org (Postfix) with ESMTPS id 13A323858D33 for ; Fri, 8 Mar 2024 18:35:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 13A323858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=dronecode.org.uk ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 13A323858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=213.120.69.98 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709922915; cv=none; b=s41F2lVXearRwYyy+l1KPBO4XuOLyhWsdi0xK4kXGY/VvedY0+S+08A7f0RvBT2U4izSBNIcHGdalzYcnrQHeaAJNZSdTzu5WiNRX8RXBIZ/9iwbTiA8qNxn+0aBSU+AALVH7FWrseemQc7TOKFyccUqsLU+F5V64SygT+N1Kf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709922915; c=relaxed/simple; bh=86Jyum4X7JHnlWU8yL3hRNRotyVKrMLOjCXtwfPbPis=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=owyTsufKIOj9FsaiBMiRfzTtjVaFDNTGpDYPfCgL4+Ble5eWIvpIY5eSyXoC+IQmnMgR+wx63FAYY8fVqI8sUMdjLliW9w1SMYeXdNEKcXP8oX3ywNFTCd31HKsHZmHQ3LFD3YG3y6gzDjgS3Vt5F8GR7OZAPqcjaAb97H3t0w8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from re-prd-rgout-004.btmx-prd.synchronoss.net ([10.2.54.7]) by re-prd-fep-041.btinternet.com with ESMTP id <20240308183512.UJMF21578.re-prd-fep-041.btinternet.com@re-prd-rgout-004.btmx-prd.synchronoss.net>; Fri, 8 Mar 2024 18:35:12 +0000 Authentication-Results: btinternet.com; none X-SNCR-Rigid: 6577B87C0AB06412 X-Originating-IP: [81.153.98.185] X-OWM-Source-IP: 81.153.98.185 X-OWM-Env-Sender: jon.turney@dronecode.org.uk X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvledrieehgdduudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuueftkffvkffujffvgffngfevqffopdfqfgfvnecuuegrihhlohhuthemuceftddunecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheplfhonhcuvfhurhhnvgihuceojhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukheqnecuggftrfgrthhtvghrnhepleeitdejhfdtveekheeugeffgeevfedtjeejveefhfeiffefkedtvdetheehieejnecukfhppeekuddrudehfedrleekrddukeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehhvghloheplhhotggrlhhhohhsthdrlhhotggrlhguohhmrghinhdpihhnvghtpeekuddrudehfedrleekrddukeehpdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepvddprhgtphhtthhopegthihgfihinhdqrghpphhssegthihgfihinhdrtghomhdprhgtphhtthhopehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkpdhrvghvkffrpehhohhsthekuddqudehfedqleekqddukeehrdhrrghnghgvkeduqdduheefrdgsthgtvghnthhrrghlphhluhhsrdgtohhmpdgruhhthhgpuhhsvghrpehjohhnthhurhhnvgihsegsthhinhhtvghrnhgvthdrtghomhdpghgvohfk rfepifeupdfovfetjfhoshhtpehrvgdqphhrugdqrhhgohhuthdqtddtge X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from localhost.localdomain (81.153.98.185) by re-prd-rgout-004.btmx-prd.synchronoss.net (authenticated as jonturney@btinternet.com) id 6577B87C0AB06412; Fri, 8 Mar 2024 18:35:12 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 02/16] Move setup_exts[] to the only place it's used Date: Fri, 8 Mar 2024 18:34:21 +0000 Message-ID: <20240308183440.4263-3-jon.turney@dronecode.org.uk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240308183440.4263-1-jon.turney@dronecode.org.uk> References: <20240308183440.4263-1-jon.turney@dronecode.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,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 List-Id: --- ini.cc | 1 + ini.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ini.cc b/ini.cc index 3ef1311..112a0ad 100644 --- a/ini.cc +++ b/ini.cc @@ -58,6 +58,7 @@ extern ThreeBarProgressPage Progress; unsigned int setup_timestamp = 0; std::string ini_setup_version; // TODO: use C++11x initializer lists instead and drop the literal array +static const std::string setup_exts[] = { "zst", "xz", "bz2", "ini" }; IniList setup_ext_list (setup_exts, setup_exts + (sizeof(setup_exts) / sizeof(*setup_exts))); diff --git a/ini.h b/ini.h index d4eaf87..4088968 100644 --- a/ini.h +++ b/ini.h @@ -21,7 +21,7 @@ typedef std::vector IniList; extern IniList found_ini_list, setup_ext_list; -const std::string setup_exts[] = { "zst", "xz", "bz2", "ini" }; + extern bool is_64bit; extern bool is_new_install; extern std::string SetupArch; -- 2.43.0