git: 989a0e1d81df - main - tzsetup: fix bootstrapping for github CI jobs
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Apr 2023 12:31:24 UTC
The branch main has been updated by yuripv:
URL: https://cgit.FreeBSD.org/src/commit/?id=989a0e1d81df5af350ed823506e4a93c5c8a4639
commit 989a0e1d81df5af350ed823506e4a93c5c8a4639
Author: Yuri Pankov <yuripv@FreeBSD.org>
AuthorDate: 2023-04-26 12:29:08 +0000
Commit: Yuri Pankov <yuripv@FreeBSD.org>
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)
{