From nobody Fri Jul 18 19:47:44 2025 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 4bkL1V5f18z62j89 for ; Fri, 18 Jul 2025 19:47:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkL1V1td4z3VbJ for ; Fri, 18 Jul 2025 19:47:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-31c38e75dafso2089190a91.2 for ; Fri, 18 Jul 2025 12:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1752868076; x=1753472876; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=hYiejbGWvJIaR+aZETpY4p6KMfGHrFdMRArkBW5PWys=; b=JZ/ZD4/wroyFzvKZDx4P02DakHLJVQFNaUYQq0bNdnBy4K4AEJ8bgaH2zsUt1jhu9f 5tSQmxw3N31ey0zNSqGkYCuMx2i6IsY9CzUyMuafx6BWQH6zRqhmDJLB8gY6zTJlFmNu GueGM+IRyu4nRsnyvW+kwWn9EL3RJZgE/H48ZsW/qgOhqM13L1uOlEswIs2Pxd3uvkf+ ghF5AQa3eGjD4ls60JZc5o6dpBcy0r/RdT9gLeoRgmBcDvGHbRSVgPJumz6rzeK2/AZC AMF6sFAd97OcUB6qxXym/+oGMagfk8cXfvpTtnDRHLunCRYCHiPrkXtqpdEGeS8pHj7I cIHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752868076; x=1753472876; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hYiejbGWvJIaR+aZETpY4p6KMfGHrFdMRArkBW5PWys=; b=d8socSRnBl2ddVJf9BiwU+U1qum9TwqysarQYvz7lYAGA/rzVGjxZwEPlZ09NVpfx7 +BTUTziF/hW//K128973XfFHGGwZ3vi16YdCldlLg5aK8Sgc8zatAId823dA+xbuymEQ +8nmvasMOfCF8DvxAjPUHtmkdV0HCZDGU3/cFOXbBYRqcjA+kBkAq3mu/uAz4Z0pPPIX 9IjJigQD86xaXGzjzk2XrNM9qv7lv2FJBoA+PFWk9jJy7lOrKKeTpxSLIEBl0cfx5mVy 5th1Z2Es6f1hrYyU3QuSKcGUo0H7kZe5AJ5oav3d4uilA6I4tLcZ9fhx4dB2na8h4z7P 122g== X-Forwarded-Encrypted: i=1; AJvYcCWVRqd3qBDvuwNI2fqsxdfCejUzJwo7wDipYElYx4V59eg8lGCktplKcE+CjlBEpKzP96A/Aqiv0ey+C3SzBVysmd75Mw==@freebsd.org X-Gm-Message-State: AOJu0YwEjH70BucQLRDDWCziOouoR5wVQ5J77MEP/OQN/pXzez42Rn7P NR2yfpyf3tPYzVVx+dZQ4rozKcGGxTx0b8zEl7+RX7REGAgIGuqd8wk/t4A0ymM5BKcFQY8dJDG Tfjjk3ziWgJhEwAsUgiaJt825MLCvTuM58AgZvRLtOA== X-Gm-Gg: ASbGncswMaDm2wTVdAfQDbxR6VvftEgEzqsK8ib+Aw23GUvt9pB4tgT/s9Kz1DPAsrH b15eEu2LVxQKEk6kqB90jh1DDSmnzZTTmqyWNsN2EmCBFfbT7fvrj65alOe3IHXnwjnpwtx7GPJ DNfkhkL5U0dgQCOxxZ8v309OUxGfCjtTA3/zaLshKy2ARe+bUQe2e73kjZOOycC+y7qFO14vosY Kw5abF3QsCK6QPK7+FdKBIFdZGRfgWPHMWk X-Google-Smtp-Source: AGHT+IEbzxfNJT8KdZiNQTWuhnRLFlEwmsBLCcaS9dznTkForxn8zWC8FCkza+XWkyLR6zoXgYa1N/yg6MY1DV176Jo= X-Received: by 2002:a17:90b:58c7:b0:312:ec:412f with SMTP id 98e67ed59e1d1-31c9f3df46fmr19692760a91.14.1752868075984; Fri, 18 Jul 2025 12:47:55 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202507181750.56IHoLIw040938@gitrepo.freebsd.org> <35gxd7qvcs7nzwh3zdoh6hnb3htjnzowwitbgi6i647qtj4evj@gpwzez6ggzbd> In-Reply-To: <35gxd7qvcs7nzwh3zdoh6hnb3htjnzowwitbgi6i647qtj4evj@gpwzez6ggzbd> From: Warner Losh Date: Fri, 18 Jul 2025 13:47:44 -0600 X-Gm-Features: Ac12FXz1uvbuS6roW4Gc4s4pZ411oJ45DyPPR3KT4vn4aBoQi1BtByFpTKFO7b4 Message-ID: Subject: Re: git: d63ffdd1ef63 - main - tzcode: Fix time zone change detection. To: Shawn Webb Cc: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4bkL1V1td4z3VbJ X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Fri, Jul 18, 2025 at 1:43=E2=80=AFPM Shawn Webb wrote: > > On Fri, Jul 18, 2025 at 05:50:21PM +0000, Dag-Erling Sm=C3=B8rgrav wrote: > > The branch main has been updated by des: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd63ffdd1ef6368407b35d415= 237b95cc739d8073 > > > > commit d63ffdd1ef6368407b35d415237b95cc739d8073 > > Author: Dag-Erling Sm=C3=B8rgrav > > AuthorDate: 2025-07-18 17:48:59 +0000 > > Commit: Dag-Erling Sm=C3=B8rgrav > > CommitDate: 2025-07-18 17:49:34 +0000 > > > > tzcode: Fix time zone change detection. > > > > Prior to the 2022g import, tzloadbody() returned -1 on error. Now = it > > returns an errno code. When I updated the time zone change detecti= on > > logic to match, I improperly returned errno in all cases, which mea= ns > > that if the time zone file has not changed since we last loaded it, > > tzloadbody() returns a random errno value instead of 0. > > > > Fixes: bc42155199b5 > > MFC after: 1 week > > Sponsored by: Klara, Inc. > > Sponsored by: NetApp, Inc. > > Reviewed by: markj > > Differential Revision: https://reviews.freebsd.org/D51405 > > --- > > contrib/tzcode/localtime.c | 14 +++++--------- > > 1 file changed, 5 insertions(+), 9 deletions(-) > > > > diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c > > index f5814a43da54..69b5f0183e2c 100644 > > --- a/contrib/tzcode/localtime.c > > +++ b/contrib/tzcode/localtime.c > > @@ -408,10 +408,8 @@ change_in_tz(const char *name) > > static char old_name[PATH_MAX]; > > static struct stat old_sb; > > struct stat sb; > > - int error; > > > > - error =3D stat(name, &sb); > > - if (error !=3D 0) > > + if (stat(name, &sb) !=3D 0) > > return -1; > > > > if (strcmp(name, old_name) !=3D 0) { > > @@ -510,13 +508,11 @@ tzloadbody(char const *name, struct state *sp, bo= ol doextend, > > * 'doextend' to ignore TZDEFRULES; the change_in_tz() > > * function can only keep state for a single file. > > */ > > - int ret =3D change_in_tz(name); > > - if (ret <=3D 0) { > > - /* > > - * Returns an errno value if there was an error, > > - * and 0 if the timezone had not changed. > > - */ > > + switch (change_in_tz(name)) { > > + case -1: > > return errno; > > + case 0: > > + return 0; > > } > > } > > fid =3D _open(name, O_RDONLY | O_BINARY); > > > > Hey DES, > > This commit broke buildworld: > > =3D=3D=3D=3D BEGIN LOG =3D=3D=3D=3D > /usr/src/contrib/tzcode/localtime.c:512:11: error: no case matching const= ant switch condition '1' [-Werror] > 512 | switch (change_in_tz(name)) { > | ^~~~~~~~~~~~~~~~~~ > /usr/src/contrib/tzcode/localtime.c:433:25: note: expanded from macro 'ch= ange_in_tz' > 433 | #define change_in_tz(X) 1 > =3D=3D=3D=3D END LOG =3D=3D=3D=3D Jenkins is also super cranky. Warner P.S. I'd just sent a private email with this when this one arrived.