From patchwork Sun Jan 5 05:57:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Eggert X-Patchwork-Id: 104082 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9413E3858D35 for ; Sun, 5 Jan 2025 06:36:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9413E3858D35 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=cs.ucla.edu header.i=@cs.ucla.edu header.a=rsa-sha256 header.s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C header.b=byzjCFUu X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.cs.ucla.edu (mail.cs.ucla.edu [131.179.128.66]) by sourceware.org (Postfix) with ESMTPS id 1AE593858C32 for ; Sun, 5 Jan 2025 05:59:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AE593858C32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=cs.ucla.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cs.ucla.edu ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1AE593858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=131.179.128.66 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736056768; cv=none; b=BeIdpWiXmQWjpYCVw4wcxsWnCHLo23kpNtTzdu95gLvGntF5Xs+rAO3J7YOkjlutRzGKQsn9Ja86clqzwnbnGnQeGaxPkeYb87cLjKOfhsf+ktLP36WWUn6T1Wya1OpWltDqq3mSka3Ey3Iv+qE7EDabDALzwRTDAsdFZNXVUUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736056768; c=relaxed/simple; bh=MCGyY8282PHa3drc4155VYR2U4s5jmlV1fIRzT9NAmk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=gBGjuz+vP1xIvzDjneVl+qxbElvnMlDwBfm4S2kbPAKcfnPbFRnQB00EQ8zAD7kvz34pVQmBT8FPIA/LyHANUcjE2JwYA6YPogBsNqxI5eFazWLlzg5lXM/imBCOhK77yNLmaYdtQszxIrijXd39l2FAnwfG3jbGWnzE0ZPGtas= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AE593858C32 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 9365C3C123845 for ; Sat, 4 Jan 2025 21:59:27 -0800 (PST) Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id RaUXsAoRvkC2; Sat, 4 Jan 2025 21:59:27 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 4FCED3C123843; Sat, 4 Jan 2025 21:59:27 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 4FCED3C123843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1736056767; bh=q63RYMdoGKRPyCG1gFptL+QL6LlTrIDiAA992Gahue4=; h=From:To:Date:Message-ID:MIME-Version; b=byzjCFUu9WkuRTtPu+0yNEUQ+Ptkk1BNEvLbLgYMkRAUn1KmY2Q8j/xhzijECmG5R KFBzZuYlJOm+FWqwAKoCJexsq5DC+U3xyjVpH8oTKlclUwiBla/vntJonbaSG/ZXsq K0Ezd0iIuSf67vYyBAFuUkcJcN2gAuPiRn9wO1U3u7mkI3aiuaahQ92a1/Y9gyrS6k kBzKGr4eKj9AgOXL53rjX80XqQ9TsEBPyEvG0UXTMScWDlo6AqxaLs+QE7/URewKsT gxKciRxTrrwqSA1+ClgpFlr3XRDCzviHgqrsdRuCkcqhy+D1gSwnXrkskKyVZoFiwq TPMejNpUTw84g== X-Virus-Scanned: amavis at mail.cs.ucla.edu Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id zxMk0nj_cCh8; Sat, 4 Jan 2025 21:59:27 -0800 (PST) Received: from wing.home (unknown [47.154.28.214]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 391B43C082EB9; Sat, 4 Jan 2025 21:59:27 -0800 (PST) From: Paul Eggert To: libc-alpha@sourceware.org Cc: Paul Eggert Subject: [PATCH 29/59] Simplify setting tz_rules to UTC Date: Sat, 4 Jan 2025 21:57:04 -0800 Message-ID: <20250105055750.1668721-30-eggert@cs.ucla.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <01207110-bd60-46ae-9c08-fb39c2011067@cs.ucla.edu> References: <01207110-bd60-46ae-9c08-fb39c2011067@cs.ucla.edu> MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org * time/tzset.c (__tzset_parse_tz): Reset to named UTC, not unnamed. (tzset_internal): Rely on __tzset_parse_tz to reset state. --- time/tzset.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/time/tzset.c b/time/tzset.c index 2bbf8f055b..1873ad205b 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -352,11 +352,11 @@ parse_rule (const char **tzp, int whichrule) void __tzset_parse_tz (const char *tz) { - /* Clear out old state and reset to unnamed UTC. */ + /* Clear out old state and reset to UTC. */ memset (tz_rules, '\0', sizeof tz_rules); if (NO_DST != 0) tz_rules[0].type = tz_rules[1].type = NO_DST; - tz_rules[0].name = tz_rules[1].name = ""; + tz_rules[0].name = tz_rules[1].name = "UTC"; /* Get the standard time zone abbreviations. */ if (parse_tzname (&tz, 0) && parse_offset (&tz, 0)) @@ -410,9 +410,6 @@ tzset_internal (int always) /* No change, simply return. */ return; - tz_rules[0].name = NULL; - tz_rules[1].name = NULL; - /* Save the value of `tz'. */ free (old_tz); old_tz = __strdup (tz); @@ -422,18 +419,10 @@ tzset_internal (int always) if (__use_tzfile) return; - /* No data file found. Default to UTC if nothing specified or if + /* No data file found. Default to UTC without leap seconds if TZDEFAULT is broken. */ - - if (*tz == '\0' || strcmp (tz, TZDEFAULT) == 0) - { - memset (tz_rules, '\0', sizeof tz_rules); - tz_rules[0].name = tz_rules[1].name = "UTC"; - if (NO_DST != 0) - tz_rules[0].type = tz_rules[1].type = NO_DST; - update_vars (); - return; - } + if (strcmp (tz, TZDEFAULT) == 0) + tz = ""; __tzset_parse_tz (tz); }