From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from re-prd-fep-042.btinternet.com (mailomta17-re.btinternet.com [213.120.69.110]) by sourceware.org (Postfix) with ESMTPS id BA85E385E000 for ; Fri, 8 Mar 2024 18:35:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BA85E385E000 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 BA85E385E000 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=213.120.69.110 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709922950; cv=none; b=cQn6LQM8f5HNOILLQCKBV4RvOPChVsdDQRZAeZZTbif3okHtmqaDnShZXiDXchazj1CtL3OKjG92dVr/1feNiWfhG8BN5THRCYeNe6SnxG4MZD3v1Oa1zN/9s8RPXiFg6LwO4zDH2LZyj3jBEE7YrT5taX54gvKaWmIylR5ClKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709922950; c=relaxed/simple; bh=4VXY5EwjO7iP6vgscm1IULK/2F158QlRjTqhQaQJDqc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=w5YRChmm5C0cbyZvD4gMEtOilhMW/iPCp2PfWw53sjpo09v7CGu0L5DUSjuMLLMN7bCoNFNYFE258zrrWkFHAjHuyUxLuJgJVMX0eDozva81/ohT8anNLcCnfXB6Z/jPpV1ALkJrRnmsFN75iTpR7eIBli/oDcwx0lyg4d5QNa8= 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-042.btinternet.com with ESMTP id <20240308183547.LJZU4314.re-prd-fep-042.btinternet.com@re-prd-rgout-004.btmx-prd.synchronoss.net>; Fri, 8 Mar 2024 18:35:47 +0000 Authentication-Results: btinternet.com; none X-SNCR-Rigid: 6577B87C0AB06774 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: gggruggvucftvghtrhhoucdtuddrgedvledrieehgdduudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuueftkffvkffujffvgffngfevqffopdfqfgfvnecuuegrihhlohhuthemuceftddunecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheplfhonhcuvfhurhhnvgihuceojhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukheqnecuggftrfgrthhtvghrnhepleeitdejhfdtveekheeugeffgeevfedtjeejveefhfeiffefkedtvdetheehieejnecukfhppeekuddrudehfedrleekrddukeehnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehhvghloheplhhotggrlhhhohhsthdrlhhotggrlhguohhmrghinhdpihhnvghtpeekuddrudehfedrleekrddukeehpdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepvddprhgtphhtthhopegthihgfihinhdqrghpphhssegthihgfihinhdrtghomhdprhgtphhtthhopehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkpdhrvghvkffrpehhohhsthekuddqudehfedqleekqddukeehrdhrrghnghgvkeduqdduheefrdgsthgtvghnthhrrghlphhluhhsrdgtohhmpdgruhhthhgpuhhsvghrpehjohhnthhurhhnvgihsegsthhinhhtvghrnhgvthdrtghomhdpghgvohfk 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 6577B87C0AB06774; Fri, 8 Mar 2024 18:35:47 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 08/16] Instantiate found_ini_list in ini.cc Date: Fri, 8 Mar 2024 18:34:27 +0000 Message-ID: <20240308183440.4263-9-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.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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: This is the list of ini files found by fromcwd.cc:do_from_local_dir(). Maybe that should be unkinked by actually doing that scan inside ini.cc, where we could have some progress feedback? This makes it possible to build ini.cc without fromcwd.cc --- fromcwd.cc | 2 -- ini.cc | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fromcwd.cc b/fromcwd.cc index f58e955..c53eede 100644 --- a/fromcwd.cc +++ b/fromcwd.cc @@ -105,8 +105,6 @@ private: std::vector found_ini; }; -IniList found_ini_list; - bool do_from_local_dir (HINSTANCE h, HWND owner, std::string &local_dir) { diff --git a/ini.cc b/ini.cc index 09dda13..2b2da10 100644 --- a/ini.cc +++ b/ini.cc @@ -56,6 +56,7 @@ std::string ini_setup_version; static const std::string setup_exts[] = { "zst", "xz", "bz2", "ini" }; IniList setup_ext_list (setup_exts, setup_exts + (sizeof(setup_exts) / sizeof(*setup_exts))); +IniList found_ini_list; static BoolOption NoVerifyOption (false, 'X', "no-verify", IDS_HELPTEXT_NO_VERIFY); static BoolOption NoVersionCheckOption (false, '\0', "no-version-check", IDS_HELPTEXT_NO_VERSION_CHECK); -- 2.43.0