From nobody Wed Apr 26 12:31:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q5ysS5wfnz47wCl; Wed, 26 Apr 2023 12:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q5ysS3WPhz44hR; Wed, 26 Apr 2023 12:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682512284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64quR3xbHtCbadHYgm55BQUV3dBZnvW3ugFU2No2huc=; b=qd+g3PpmCPXuBPHD1L1LgSw4cXQx7ki0RW0l2FW9PKnNg1hKSVX8ivON86kNTRz3bejcR8 8JMhgteD/8JvFpAlUORULcyOZwuK0udzN+GmuCDvUn0jkd2hIyH05LbjS/D0JoBZnefvkR SJevYQZx2SotzfaOnWRe2osWQRosW7Vb2izK/xesCQDv35Jhdmr3HKsZyzqbpNStEDs5/y f92bIG44FQsHzMz+G6Bd2SsopKSYSQoJXXnsfDc0GKAmpDbHa6QjxZmkFM8VlQxXT1D7SP 00trhQXfunhxbBxlHtzkJanAN7QmoDPvfTuMNrgV7+hpuEB5MT5rLSMmjm7GwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682512284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64quR3xbHtCbadHYgm55BQUV3dBZnvW3ugFU2No2huc=; b=JgkF9ksaO/ENMA6XzQ5AaHhpMux8iqiGcIslkgLzg67UpV+8a2jFeRRUrMVJTr2SD9md/v iYdaQ9jXXWK8ZuzbVPoe0mteA6yQkhwk625z4O4vqi2VwBxWlUuKO/MgN5WhZ9m6fc2uV2 pLHKSfQSYo7cnrlSlO1egXx8VnIZJ46vzukvaJvQnhD3N65kBE/wU1m8Tp98IYINjug6Sf 3BR0R26jBlkm3Kh4RdzUew5O1eaQn7Vzw1wOe0RPwAy5Pc68Sy6BSCGyLFxg9ATkAM737G 09yYo33iug8PTZ7SBjCq+f09F25eXbpO5y1vZHKFZ+qPir1IA8hox+pSl1rS7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682512284; a=rsa-sha256; cv=none; b=Df780kspCJPHeg1o+Lt094AUq0+sCU0r7a8cBdpr1NFIUff8j0YOj34lMWIkIYKZecbm6B +U9fO+rI1ifuDMoCXzrNr1C6iVDHbPfCVcuj3ndIM7CphmcsSPD97bZm7JTE+6y1GaECsN kZqSZUIzoWoM/h0GAZN/ZO2HDjbDnUS7AE/P+yulzv8UMOILU5tLvKJMq/9Z+g8+6RNUI8 5TFFPc0/f3bJoZE/uLnbU8BaFhCIBo8xG3Lzx0wXF7knNzdIz+7fh58n0inLVpydGaM6ne ItatCKe4x2uJixfbV6AcL9LbLj36Pf//G+VssXuColPI+WBkQ3qH1K8yH7V7Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q5ysS2cNJzZbd; Wed, 26 Apr 2023 12:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QCVOGS018424; Wed, 26 Apr 2023 12:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QCVOu7018423; Wed, 26 Apr 2023 12:31:24 GMT (envelope-from git) Date: Wed, 26 Apr 2023 12:31:24 GMT Message-Id: <202304261231.33QCVOu7018423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 989a0e1d81df - main - tzsetup: fix bootstrapping for github CI jobs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 989a0e1d81df5af350ed823506e4a93c5c8a4639 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=989a0e1d81df5af350ed823506e4a93c5c8a4639 commit 989a0e1d81df5af350ed823506e4a93c5c8a4639 Author: Yuri Pankov AuthorDate: 2023-04-26 12:29:08 +0000 Commit: Yuri Pankov CommitDate: 2023-04-26 12:29:08 +0000 tzsetup: fix bootstrapping for github CI jobs Move dump_zonetab() under HAVE_BSDDIALOG as the parsing code it relies on already is. --- usr.sbin/tzsetup/tzsetup.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 76f6a2537de6..b4d906d90b7e 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -483,6 +483,27 @@ read_zones(void) fclose(fp); } +static void +dump_zonetab(void) +{ + struct country *cp; + struct zone *zp; + const char *cont; + + for (cp = countries; cp->name != NULL; cp++) { + printf("%s:%s\n", cp->tlc, cp->name); + if (cp->nzones < 0) { + cont = find_continent_name(cp->continent); + printf(" %s:%s\n", cont, cp->filename); + } else { + TAILQ_FOREACH(zp, &cp->zones, link) { + cont = find_continent_name(zp->continent); + printf(" %s:%s\n", cont, zp->filename); + } + } + } +} + static void make_menus(void) { @@ -799,27 +820,6 @@ install_zoneinfo(const char *zoneinfo) return (rv); } -static void -dump_zonetab(void) -{ - struct country *cp; - struct zone *zp; - const char *cont; - - for (cp = countries; cp->name != NULL; cp++) { - printf("%s:%s\n", cp->tlc, cp->name); - if (cp->nzones < 0) { - cont = find_continent_name(cp->continent); - printf(" %s:%s\n", cont, cp->filename); - } else { - TAILQ_FOREACH(zp, &cp->zones, link) { - cont = find_continent_name(zp->continent); - printf(" %s:%s\n", cont, zp->filename); - } - } - } -} - static void usage(void) {