- tz - lists.iana.org

DST in the news: DC-area subway glitch
by Arthur David Olson Nov. 6, 2012

Nov. 6, 2012

Page B3 of the print edition of the 2012-11-06 Washington Post has the story "Metro time-change error strands riders;" the on-line version is available at... http://www.washingtonpost.com/blogs/dr-gridlock/wp/2012/11/05/metro-closes-… The DC-area Metro rail system failed to turn its clocks back and closed an hour earlier than expected. In line with past practice, Metro issued a pro-forma apology but provided neither an explanation nor an offer of compensation. --ado

1 0

[PATCH] Automate the building of tarball signatures.
by Paul Eggert Nov. 5, 2012

Nov. 5, 2012

* Makefile (public): Rewrite in terms of new rules, below. (check_public): New rule, containing the old checking part of 'make public'. (tarballs): New rule, containing the old tarball-making part of 'make public'. Do not run checktab twice. (signatures, tzcode$(VERSION).tar.gz.sign, tzdata$(VERSION).tar.gz.sign): New rules. --- Makefile | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c8150ba..c09d20f 100644 --- a/Makefile +++ b/Makefile @@ -420,6 +420,8 @@ maintainer-clean: clean names: @echo $(ENCHILADA) +public: check check_public set-timestamps tarballs signatures + # Set the time stamps to those of the git repository, if available, # and if the files have not changed since then. # This uses GNU 'touch' syntax 'touch -d@N FILE', @@ -439,26 +441,41 @@ set-timestamps: # The zics below ensure that each data file can stand on its own. # We also do an all-files run to catch links to links. -public: $(ENCHILADA) set-timestamps +check_public: $(ENCHILADA) make maintainer-clean make "CFLAGS=$(GCC_DEBUG_FLAGS)" mkdir -m go-rwx /tmp/,tzpublic - -for i in $(TDATA) ; do zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; done + -for i in $(TDATA) ; do \ + zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; \ + done for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done zic -v -d /tmp/,tzpublic $(TDATA) || exit rm -f -r /tmp/,tzpublic + +tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz + +tzcode$(VERSION).tar.gz: $(COMMON) $(DOCS) $(SOURCES) $(MISC) for i in *.[1-8] ; do \ LC_ALL=C sh workman.sh $$i > $$i.txt && \ touch -r $$i $$i.txt || exit; \ done - $(AWK) -f checktab.awk $(PRIMARY_YDATA) LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - \ $(COMMON) $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | \ - gzip $(GZIPFLAGS) > tzcode$(VERSION).tar.gz + gzip $(GZIPFLAGS) > $@ + +tzdata$(VERSION).tar.gz: $(COMMON) $(DATA) LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \ - gzip $(GZIPFLAGS) > tzdata$(VERSION).tar.gz + gzip $(GZIPFLAGS) > $@ + +signatures: tzcode$(VERSION).tar.gz.sign tzdata$(VERSION).tar.gz.sign + +tzcode$(VERSION).tar.gz.sign: tzcode$(VERSION).tar.gz + gpg --armor --detach-sign -o $@ $? + +tzdata$(VERSION).tar.gz.sign: tzdata$(VERSION).tar.gz + gpg --armor --detach-sign -o $@ $? typecheck: make clean -- 1.7.9.5

3 3

[PATCH 3/3] Changes for Bahia, Tocantins, Israel, Jordan.
by Paul Eggert Nov. 5, 2012

Nov. 5, 2012

* asia (Zion): New Israeli rules next year. See Ephraim Silverberg in <http://mm.icann.org/pipermail/tz/2012-October/018351.html>. (Jordan): Jordan stays on DST this winter. See Steffen Thorsen in <http://mm.icann.org/pipermail/tz/2012-October/018374.html>. * southamerica (America/Araguaina): Now has DST. See Rodrigo Severo in <http://mm.icann.org/pipermail/tz/2012-October/018346.html>. (America/Bahia): No longer has DST. See Kelley Cook in <http://mm.icann.org/pipermail/tz/2012-October/018349.html>. --- asia | 82 ++++++++++++++++++++++++++++++++-------------------------- southamerica | 15 +++++++++-- 2 files changed, 58 insertions(+), 39 deletions(-) diff --git a/asia b/asia index 8e896fc..7d12e8b 100644 --- a/asia +++ b/asia @@ -1170,15 +1170,15 @@ Rule Zion 2004 only - Sep 22 1:00 0 S # # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps -# From Paul Eggert (2005-02-22): +# From Paul Eggert (2012-10-26): # I used Ephraim Silverberg's dst-israel.el program # <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20) # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4, -# to generate the transitions in this list. +# to generate the transitions from 2005 through 2012. # (I replaced "lastFri" with "Fri>=26" by hand.) -# The spring transitions below all correspond to the following Rule: +# The spring transitions all correspond to the following Rule: # -# Rule Zion 2005 max - Mar Fri>=26 2:00 1:00 D +# Rule Zion 2005 2012 - Mar Fri>=26 2:00 1:00 D # # but older zic implementations (e.g., Solaris 8) do not support # "Fri>=26" to mean April 1 in years like 2005, so for now we list the @@ -1195,39 +1195,36 @@ Rule Zion 2009 only - Sep 27 2:00 0 S Rule Zion 2010 only - Sep 12 2:00 0 S Rule Zion 2011 only - Apr 1 2:00 1:00 D Rule Zion 2011 only - Oct 2 2:00 0 S -Rule Zion 2012 2015 - Mar Fri>=26 2:00 1:00 D +Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D Rule Zion 2012 only - Sep 23 2:00 0 S -Rule Zion 2013 only - Sep 8 2:00 0 S -Rule Zion 2014 only - Sep 28 2:00 0 S -Rule Zion 2015 only - Sep 20 2:00 0 S -Rule Zion 2016 only - Apr 1 2:00 1:00 D -Rule Zion 2016 only - Oct 9 2:00 0 S -Rule Zion 2017 2021 - Mar Fri>=26 2:00 1:00 D -Rule Zion 2017 only - Sep 24 2:00 0 S -Rule Zion 2018 only - Sep 16 2:00 0 S -Rule Zion 2019 only - Oct 6 2:00 0 S -Rule Zion 2020 only - Sep 27 2:00 0 S -Rule Zion 2021 only - Sep 12 2:00 0 S -Rule Zion 2022 only - Apr 1 2:00 1:00 D -Rule Zion 2022 only - Oct 2 2:00 0 S -Rule Zion 2023 2032 - Mar Fri>=26 2:00 1:00 D -Rule Zion 2023 only - Sep 24 2:00 0 S -Rule Zion 2024 only - Oct 6 2:00 0 S -Rule Zion 2025 only - Sep 28 2:00 0 S -Rule Zion 2026 only - Sep 20 2:00 0 S -Rule Zion 2027 only - Oct 10 2:00 0 S -Rule Zion 2028 only - Sep 24 2:00 0 S -Rule Zion 2029 only - Sep 16 2:00 0 S -Rule Zion 2030 only - Oct 6 2:00 0 S -Rule Zion 2031 only - Sep 21 2:00 0 S -Rule Zion 2032 only - Sep 12 2:00 0 S -Rule Zion 2033 only - Apr 1 2:00 1:00 D -Rule Zion 2033 only - Oct 2 2:00 0 S -Rule Zion 2034 2037 - Mar Fri>=26 2:00 1:00 D -Rule Zion 2034 only - Sep 17 2:00 0 S -Rule Zion 2035 only - Oct 7 2:00 0 S -Rule Zion 2036 only - Sep 28 2:00 0 S -Rule Zion 2037 only - Sep 13 2:00 0 S + +# From Ephraim Silverberg (2012-10-18): + +# Yesterday, the Interior Ministry Committee, after more than a year +# past, approved sending the proposed June 2011 changes to the Time +# Decree Law back to the Knesset for second and third (final) votes +# before the upcoming elections on Jan. 22, 2013. Hence, although the +# changes are not yet law, they are expected to be so before Februray 2013. +# +# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. +# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the +# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day +# later (i.e. at 02:00 the first Monday after October 2). +# [Rosh Hashana holidays are factored in until 2100.] + +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D +Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S +Rule Zion 2027 only - Oct Mon>=3 2:00 0 S +Rule Zion 2028 max - Oct Sun>=2 2:00 0 S +# The following rules are commented out for now, as they break older +# versions of zic that support only signed 32-bit timestamps, i.e., +# through 2038-01-19 03:14:07 UTC. +#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S +#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S +#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S +#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S +#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Jerusalem 2:20:56 - LMT 1880 @@ -1362,6 +1359,16 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u # From Arthur David Olson (2009-04-06): # We still have Jordan switching to DST on Thursdays in 2000 and 2001. +# From Steffen Thorsen (2012-10-25): +# Yesterday the government in Jordan announced that they will not +# switch back to standard time this winter, so the will stay on DST +# until about the same time next year (at least). +# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 +# +# From Paul Eggert (2012-10-25): +# For now, assume this is just a one-year measure. If it becomes +# permanent, we should move Jordan from EET to AST effective tomorrow. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - @@ -1390,7 +1397,8 @@ Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 max - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - +Rule Jordan 2013 max - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 2:00 Jordan EE%sT diff --git a/southamerica b/southamerica index ab4d14d..3195846 100644 --- a/southamerica +++ b/southamerica @@ -829,6 +829,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina… # </a> +# From Kelley Cook (2012-10-16): +# The governor of state of Bahia in Brazil announced on Thursday that +# due to public pressure, he is reversing the DST policy they implemented +# last year and will not be going to Summer Time on October 21st.... +# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-hor… + +# From Rodrigo Severo (2012-10-16): +# Tocantins state will have DST. +# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) @@ -1048,7 +1057,8 @@ Zone America/Araguaina -3:12:48 - LMT 1914 -3:00 Brazil BR%sT 1990 Sep 17 -3:00 - BRT 1995 Sep 14 -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT + -3:00 - BRT 2012 Oct 21 + -3:00 Brazil BR%sT # # Alagoas (AL), Sergipe (SE) Zone America/Maceio -2:22:52 - LMT 1914 @@ -1067,7 +1077,8 @@ Zone America/Maceio -2:22:52 - LMT 1914 Zone America/Bahia -2:34:04 - LMT 1914 -3:00 Brazil BR%sT 2003 Sep 24 -3:00 - BRT 2011 Oct 16 - -3:00 Brazil BR%sT + -3:00 Brazil BR%sT 2012 Oct 21 + -3:00 - BRT # # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), -- 1.7.9.5

2 3

[PATCH 2/2] Improve logic of zic -v abbreviation-length check.
by Paul Eggert Nov. 4, 2012

Nov. 4, 2012

This fixes a bunch of "time zone abbreviation has more than 3 alphabetics" diagnostics for 'make check_public'. * zic.c (newabbr): Check for <3 alphabetics, not for >3. POSIX-2008 requires at least 3 and says that it's not portable to use more than 6, which we check elsewhere. --- zic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zic.c b/zic.c index 64af1b2..a9a54bb 100644 --- a/zic.c +++ b/zic.c @@ -2534,8 +2534,8 @@ newabbr(const char *const string) ++cp; if (cp - string == 0) mp = _("time zone abbreviation lacks alphabetic at start"); - if (noise && cp - string > 3) -mp = _("time zone abbreviation has more than 3 alphabetics"); + if (noise && cp - string < 3) +mp = _("time zone abbreviation has fewer than 3 alphabetics"); if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) mp = _("time zone abbreviation has too many alphabetics"); if (mp == NULL && (*cp == '+' || *cp == '-')) { -- 1.7.9.5

1 0

[PATCH 1/2] Check 'public' more carefully.
by Paul Eggert Nov. 4, 2012

Nov. 4, 2012

Here's the first of two more proposed patches for next time. * Makefile (ZFLAGS): Remove obsolete comment. (check_public): Put temporary directory under this directory, not under /tmp, as that's better if one is doing multiple builds in parallel. Also, use the just-built zic rather than the system zic. (clean): Remove temporary directory. --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index fd909f7..ea081a3 100644 --- a/Makefile +++ b/Makefile @@ -229,9 +229,6 @@ CFLAGS= LDFLAGS= $(LFLAGS) -# If you want zic's -s option used when installing, uncomment the next line -# ZFLAGS= -s - zic= ./zic ZIC= $(zic) $(ZFLAGS) @@ -411,6 +408,7 @@ check_web: $(WEB_PAGES) clean: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype + rm -f -r tzpublic maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -444,13 +442,12 @@ set-timestamps: check_public: $(ENCHILADA) make maintainer-clean make "CFLAGS=$(GCC_DEBUG_FLAGS)" - mkdir -m go-rwx /tmp/,tzpublic - -for i in $(TDATA) ; do \ - zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; \ + mkdir tzpublic + for i in $(TDATA) ; do \ + $(zic) -v -d tzpublic $$i 2>&1 || exit; \ done - for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done - zic -v -d /tmp/,tzpublic $(TDATA) || exit - rm -f -r /tmp/,tzpublic + $(zic) -v -d tzpublic $(TDATA) + rm -f -r tzpublic tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz -- 1.7.9.5

1 0

tzcode2012i and tzdata2012i available
by Paul Eggert Nov. 3, 2012

Nov. 3, 2012

The 2012i release of the tz code and data is available. It reflects the following changes recently circulated on the tz mailing list: Cuba switches from DST tomorrow at 01:00. (Thanks to Steffen Thorsen.) Linker flags can now be specified via LDFLAGS. AWK now defaults to 'awk', not 'nawk'. The shell in tzselect now defaults to /bin/bash, but this can be overridden by specifying KSHELL. The main web page now mentions the unofficial github repository. (Thanks to Mike Frysinger.) Tarball signatures can now be built by running 'make signatures'. There are also new makefile rules 'tarballs', 'check_public', and separate makefile rules for each tarball and signature file. A few makefile rules are now more portable to strict POSIX. The main web page now lists the canonical IANA URL. Here are links to the release files: http://www.iana.org/time-zones/repository/releases/tzcode2012i.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2012i.tar.gz ftp://ftp.iana.org/tz/releases/tzcode2012i.tar.gz ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz Each release file has a GPG signature, which can be retrieved by appending ".sign" to the above URLs. Copies of these signatures are appended to this message. As usual, links to the latest release files are here: http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz ftp://ftp.iana.org/tz/tzcode-latest.tar.gz ftp://ftp.iana.org/tz/tzdata-latest.tar.gz This release corresponds to commit a1752133a1b2ad076a2901fea51f8e3b3ab83379 in the unofficial github repository at <https://github.com/eggert/tz>. Here are the GPG checksums for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQlXcwAAoJEO2X6Q5iqn40DmYP/2D4aEgIjN7lhjvkR5NnjYsd F4bhu2Obs8uLKAM3RalV7DS8YIT/wilsIA1xpW/XW+bv0FMymuJElEqfdL4VdfIE gg+/Xr3i2qsN664sqGnJekqwF1jjQfeA5ofOzxs5Bt7Yt4g2pqPiNAu1cm/7rBlF Pr6pKhQ9J71mmKo1r1J5echCDuPv0vyShmB+uNN0p6xqTsV9rLFLeh5+517cIIAp uadhThR/2ygs0ZMMsAQ8Xq5NRXYTnlKG/poHwdYwWV6yOTGFVJpbHz2Gz5BhCBvO nNEhLSgvrR2m2S73Jp6o3laFhYiJm7RhZl3mS6yXZApoYOu9r2lxU1hNzD7NYZSN I9xFYDa4haO0XxN0AgYHl4LuK9keqjGZsA5OlzG2bs8nH3ZNfopuRbtZDy10zxQs 8IBMbgdHDnOS9j3F4/f+jzrp0kGD6V1dvgCE8xHa/dcewdZaGFqjFezlK49uKIJF cEXuBTDI3pXiZ29gdVzUn2RyQ3ezjoKUfaxsloRlXIvJxrd7EJeDuWWMWWfqhu16 +xr/ocdceCcKjbGhV134O1kgM9s6jWxxUApycdmRchAuDNS9JF+mrHpuJ0mnkPP/ HGKPXFb+p2BywPjkxDLxdLsZYoIt+C502hdo/YnKpIKHGDDbD/YK4V0K2qrvJv68 u1zKzIUdRKRZ3jmOKY1r =Ru59 -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQlXcwAAoJEO2X6Q5iqn40Xu0P/3gkB48HDohDwtIfFRQlgo+z cbfWoSQ8ZDvFJRRpkJsqWryahKwn6ezd8yt2CmkdfvcFd4WggjrQIJC9wEZtRgog Y9laePIvwveWaxccc//iPfThsOdgUANqCWziEOxZwJAWbQvprv6YYuyXx2t2VC5s LqN62EgJJXlbCK43yhIoJrVQh/z5nAt8ObDuvkOM0f5JGTPXFZYQda/KFp8iNR0l 0HuKafacPNSRDTi8YTEBs8EH75MaLbcZzzFt5gN/FiW1FgrPmW44IKn0F89O3AIF Yh88+8DV3XKtSuaHPSnZXFXaa0IvEq5vec897zdW8dSSwlUazfzlcnTi19kiesZ3 PVMeeK6lwfBftZZ5/E62gVfQZZIebOnJdEw3sopo2BZaIdTwBLLYI019kzPO4U64 Z1EBDuFAQ3yd8nQnJF2f/vaQOwOwpuo3ZVjFJPqqp2+9+Xg5mv3StKRhFNrm9Nun kIVgsZUtjD5HfpM5S4QqbU1WRPdJVp0aTZwz7gKz/GrcKIEQFj039DvyEB5iY16Q MPPpQ5/yGeJ5K3fgcT+gBxklMOz7MoZ90NveZ4cQ0KHogs6walDAGi7LKWPVobDn hE1R2+n9BUdikcxk9EJ+LJYr4NXOCKiikzurV+EfXM/IGRKUnTKrOGJV+9l5hSPx Juu9SIUxSNpAsjS/55lc =p8iS -----END PGP SIGNATURE-----

1 0

Cuba changing clocks this Sunday
by Steffen Thorsen Nov. 3, 2012

Nov. 3, 2012

Radio Reloj and many other sources report that Cuba is changing back to standard time on 2012-11-04: http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-… The database currently has it changing on the last Sunday of October. Best regards, Steffen Thorsen - timeanddate.com

2 1

Australia AEDT/EDT
by Steven Weiss Nov. 1, 2012

Nov. 1, 2012

Hi, I've been testing the timezone abbreviation and it seems to be incorrect for the current DST The abbreviation is giving me a EST instead of the expected EDT. I'm aware from your list there is a lot of discussion around EST/EDT vs AEST/AEDT. This is not the issue for me. either/or would be fine. Rather it appears that it should currently EDT/AEDT. I've downloaded the latest data and code as per the README. Regards Steven Weiss Cape Town South Africa

3 3

[PATCH 1/3] build: handle standard LDFLAGS variable
by Mike Frysinger Oct. 28, 2012

Oct. 28, 2012

This changes LFLAGS to the more standard LDFLAGS (while preserving backwards compatibility). It also adds the missing $(LDFLAGS) usage when linking `date`. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ab0f54b..625c6b2 100644 --- a/Makefile +++ b/Makefile @@ -224,6 +224,10 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ CFLAGS= +# Linker flags. + +LDFLAGS= $(LFLAGS) + # If you want zic's -s option used when installing, uncomment the next line # ZFLAGS= -s @@ -338,10 +342,10 @@ version.h: 'static char const TZVERSION[]="tz$(VERSION)";' zdump: $(TZDOBJS) - $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ zic: $(TZCOBJS) yearistype - $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ yearistype: yearistype.sh cp yearistype.sh yearistype @@ -380,8 +384,8 @@ $(TZLIB): $(LIBOBJS) then ranlib $@ ; fi date: $(DATEOBJS) - $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \ - $(LDLIBS) -lc -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o \ + strftime.o $(LDLIBS) -lc -o $@ tzselect: tzselect.ksh sed \ -- 1.7.12

9 20

[PATCH] mention the github repo in the main tz page
by Mike Frysinger Oct. 27, 2012

Oct. 27, 2012

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tz-link.htm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tz-link.htm b/tz-link.htm index d1a8bf1..c55b94f 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -102,6 +102,8 @@ gzip -dc tzdata-latest.tar.gz | tar -xf - The code and data files can also be obtained from the <a href="http://www.iana.org">IANA</a> <a href="http://www.iana.org/time-zones">timezone web page</a>. +You can clone via <a href="http://git-scm.com/">git</a> the latest repository +from the <a href="https://github.com/eggert/tz">github tz repo</a>. <p> The code lets you compile the <code>tz</code> source files into machine-readable binary files, one for each location. It also lets -- 1.7.12

2 2

tzcode2012h and tzdata2012h available
by Paul Eggert Oct. 27, 2012

Oct. 27, 2012

[I forgot to CC: this to tz(a)iana.org, so I am doing it separately this time.] -------- Original Message -------- Subject: tzcode2012h and tzdata2012h available Date: Fri, 26 Oct 2012 23:18:24 -0700 From: Paul Eggert <eggert(a)cs.ucla.edu> To: Time zone announcements <tz-announce(a)iana.org> The 2012h release of the tz code and data is available. It reflects the following changes recently circulated on the tz mailing list: Bahia no longer has DST. (Thanks to Kelley Cook.) Tocantins has DST. (Thanks to Rodrigo Severo.) Israel has new DST rules next year. (Thanks to Ephraim Silverberg.) Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) Web page updates. More C modernization, except that at Arthur David Olson's suggestion the instances of 'register' were kept. This release does not include an improved way of distributing checksums; I haven't had time to work the kinks out of that. Here are links to the release files: http://www.iana.org/time-zones/repository/releases/tzcode2012h.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2012h.tar.gz ftp://ftp.iana.org/tz/releases/tzcode2012h.tar.gz ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz As usual, links to the latest release files are here: http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz ftp://ftp.iana.org/tz/tzcode-latest.tar.gz ftp://ftp.iana.org/tz/tzdata-latest.tar.gz This release corresponds to commit 001a626d31ffb02dec209e539c9aedaf2f27ba20 in the unofficial github repository at <https://github.com/eggert/tz>. Here are the GPG checksums for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQi3j1AAoJEO2X6Q5iqn40CXwP/1mQEIce/rO3BL2nFwnHoyTh F3FgSlnvCz65YJODlFROTPOsiKbrxJepILLoBXNQOgkD+gusQLrXCCvGMhu5aJ/9 OTxtRDdNC7F6b/HDW8Frw7oaD7ljMkos30vEtNrpM5xFQ3p5qc4jfGTMjq5RUR5B 2H7mxgnJXC4A0QznEjEnmnZ4z3Tm3XEhj3LEItH8c5VtIHmc/wZkrJATRT04sivN 221eF66T3rQFrmnrwayq96q+yxM9U+Y21oGw9MPlHA3eCXk/G/zmNYui6QVOL96z SGgPLj52M5CTTlWoLt5KUbrW6bKdhyX0zYX/j8pbD6haex0cfz02rJFiPUHtqwFt mnD2mvpQFqnCfua+LHSTrBGPm0N6v1WBg8UV1E3xQeVkF7S/8+OGtvAkSA4vICfE 5/u/LIXgn5NKt5u+LHr1/aAgtRLjAEr1B77noilC4C3pV+q2jIkp+TUAfV5gKMKx yOsKJF8g8y8mP8UWE9lkNLPepQ4RcsiRWMOV4CfMhJg6LJfLix+fnplEp09riWfc q0ngk5Qa7ydFykofvdb97yI0NuCsFbxkEdQpqvW6LeuMRtw7XXsgGoJwsD9lF4qL PsN0OIhNG04PIZEPPtulQih4Eeip2vfrOSCy07/6+8HoBFSkzEYPPCwnoiJ3QFYt bIOmNJLXmhYxrw2alIV2 =7FjC -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQi3khAAoJEO2X6Q5iqn40NV4P/RQK6e+9CF99rJB17EFvE2WD t7H2sg2Rfl805Iha/acl3DMJQepcSGvsv4paXD0buRJWlaTRbaY9nhk7bxi3VSfx A/IJTAd4ZiQLiD+J0IHTwE7NmV6r1GCqNs37H5iENDZp9gYXW59jePnfD0TitIND 9mFSCxWV5tZsktZIztUqYWcz/oABVODnaSGx21DTi27Y6aJpKxl5+TTRbPcFgQ6V 0jWsakzgJwWLRh1eTglFTSgbt2ui/o5D/W0d1RvtRlRHmXiLf3J3YO7PDWrCg/// 7CAf4MSL20OH4fG4Lj4IfCh86stEjKpgn+YmZjndkKYgBqKkve8r8yAkubAHni5q Jrod8g87w0W/XFw9C6C5kEN9+qCTXfM/zkBeh75iDVxvAJ0+G6DZRC9coL41tawl zg+s7dl+fiGjZzzDY287/tUP/u0omgHnG/OHkL/52KmTfVfbhLJvndrWe4ehx1z2 Z4gAdiIvCooh34uDRcK/EHWXV0FgX9Zf+k9LPy+7xSLELFoxVVbwJ8KTrQxzTwEL Qzx4nx7z1AEMIvm2HCZi+2pnBmrNYjG5quWyd2PxVuhYVFdqbRPZqPJh+9Qm0o4b +S6m/FmI/tkubF+J5uoQA8KowhZ5HU8DWo2LCNxSzyDRZAGzLEN8OPXpWIZ/3IMV m9JFu3Sqjuypx973arIQ =d4Nr -----END PGP SIGNATURE-----

4 3

Australian Timezone Abreviations - Next step
by Shaun Bouckaert Oct. 27, 2012

Oct. 27, 2012

After taking some time off from this issue, I've considered the next logical step to be contacting the relevant government departments in charge of the timezone legislation in each state. As a Queenslander I will start with the Queensland Attorney-General, as the timezone legislation falls under his responsibility. I honestly believe that the only argument for the status quo on this issue is that it's been this way for a long time. I have previously presented many good arguments as to why it needs to be updated to reflect what is widely used amongst government and private organisations across the country, and what is presented by the federal government on this page http://australia.gov.au/about-australia/our-country/time Hopefully, with responses from the relevant state departments, this issue can be resolved and put to bed. Shaun

15 28

bringing tzcode in the ANSI era
by christos＠zoulas.com Oct. 26, 2012

Oct. 26, 2012

Thanks Paul for the ANSI prototypes, now can we please 's/register //g'? It is not adding any value... christos

6 6

[PATCH 2/3] Web page updates.
by Paul Eggert Oct. 26, 2012

Oct. 26, 2012

* tz-link.htm (DC.Identifier): Move canonical location to cs.ucla.edu. Move public-domains and corrections notices to <address>. Update some URLs. Add Android. Mac OS X has been renamed to OS X. --- tz-link.htm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tz-link.htm b/tz-link.htm index f4371df..d1a8bf1 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -8,22 +8,15 @@ <meta http-equiv="Content-type" content='text/html; charset="US-ASCII"'> <meta name="DC.Creator" content="Eggert, Paul"> <meta name="DC.Contributor" content="Olson, Arthur David"> -<meta name="DC.Date" content="2012-07-19"> +<meta name="DC.Date" content="2012-10-26"> <meta name="DC.Description" content="Sources of information about time zones and daylight saving time"> -<meta name="DC.Identifier" content="http://www.twinsun.com/tz/tz-link.htm"> +<meta name="DC.Identifier" content="http://cs.ucla.edu/~eggert/tz/tz-link.htm"> <meta name="Keywords" content="database,daylight saving,DST,time zone,timezone,tz,zoneinfo"> </head> <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> -<p> -This file is in the public domain, so clarified as of -2009-05-17 by Arthur David Olson. -</p> -<p> -Please send corrections to this web page to the -<a href="mailto:tz@iana.org">time zone mailing list</a>.</p> <h2>The <code>tz</code> database</h2> <p> The <a href="http://en.wikipedia.org/wiki/Public_domain">public-domain</a> @@ -38,13 +31,14 @@ title="Coordinated Universal Time">UTC</abbr></a> offsets, and <a href="http://en.wikipedia.org/wiki/Daylight_saving">daylight-saving</a> rules. This database (often called <code>zoneinfo</code> or <a -href="http://en.wikipedia.org/wiki/TZ_database"><code>tz</code></a>) +href="http://en.wikipedia.org/wiki/Tz_database"><code>tz</code></a>) is used by several implementations, including <a href="http://www.gnu.org/software/libc/">the <abbr title="GNU's Not Unix">GNU</abbr> C Library</a> used in <a href="http://www.linux.org/"><abbr>GNU</abbr>/Linux</a>, +<a href="http://www.android.com/">Android</a>, <a href="http://www.freebsd.org/">FreeBSD</a>, <a href="http://netbsd.org/">NetBSD</a>, <a href="http://openbsd.org/">OpenBSD</a>, @@ -52,9 +46,9 @@ C Library</a> used in <a href="http://www.delorie.com/djgpp/"><abbr title="DJ's GNU Programming Platform">DJGPP</abbr></a>, <a href="http://ibm.com/aix">AIX</a>, -<a href="http://www.apple.com/macosx/">Mac OS X</a>, <a href="http://h71000.www7.hp.com/">OpenVMS</a>, <a href="http://oracle.com/database">Oracle Database</a>, +<a href="http://www.apple.com/osx/">OS X</a>, <a href="http://sun.com/software/solaris">Solaris</a>, <a href="http://h30097.www3.hp.com/">Tru64</a>, and <a href="http://sco.com/products/unixware">UnixWare</a>.</p> @@ -699,5 +693,13 @@ Reference: Time</a></li> <li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time">Yahoo! Directory > Science > Measurements and Units > Time</a></li> </ul> +<hr> +<address> +This file is in the public domain, so clarified as of +2009-05-17 by Arthur David Olson. +<br> +Please send corrections to this web page to the +<a href="mailto:tz@iana.org">time zone mailing list</a>. +</address> </body> </html> -- 1.7.9.5

1 0

[PATCH 1/3] More C modernization.
by Paul Eggert Oct. 26, 2012

Oct. 26, 2012

* Makefile (typecheck): Add -D__time_t_defined to CFLAGS, for glibc 2.15. * asctime.c (asctime_r, asctime): * date.c (main, dogmt, reset, nondigit, sametm, convert, checkfinal): * ialloc.c (icatalloc): * localtime.c (detzcode, detzcode64, settzname, tzload) (typesequiv, getzname, getqzname, getnum, getsecs, getoffset) (getrule, transtime, tzparse, tzset, localsub, gmtsub) (leaps_thru_end_of, timesub, increment_overflow) (long_increment_overflow, normalize_overflow) (long_normalize_overflow, tmcomp, time2sub, time1, leapcorr): * scheck.c (scheck): * strftime.c (_yconv): * zdump.c (my_localtime, abbrok, main, yeartot, hunt) (delta, show, abbr, dumptime): * zic.c (main, dolink, itsdir, associate, infile, inrule) (inzone, inzcont, inzsub, inleap, inlink, rulesub, convert64) (writezone, doabbr, stringoffset, stringrule, stringzone) (outzone, addtype, leapadd, adjleap, ciequal, itsabbr, byword) (getfields, rpytime, newabbr, mkdirs): Omit 'register', as it adds no value these days. See Christos Zoulas in <http://mm.icann.org/pipermail/tz/2012-October/018376.html>. * date.c (netsettime) [TSP_SETDATE]: Add forward decl. Don't rely on implicit int. Now static. Use NULL, not 0. * zdump.c: Include "limits.h". (absolute_min_time, absolute_max_time): Compute at compile-time, as the run-time tests relied on undefined behavior. (checkabsolutes): Rename from setabsolutes. Just check, since there's nothing to set now. All uses changed. --- Makefile | 2 +- asctime.c | 8 +- date.c | 64 ++++++++------- ialloc.c | 4 +- localtime.c | 253 +++++++++++++++++++++++++++++----------------------------- scheck.c | 12 +-- strftime.c | 4 +- zdump.c | 162 ++++++++++++++++++------------------- zic.c | 254 +++++++++++++++++++++++++++++------------------------------ 9 files changed, 380 insertions(+), 383 deletions(-) diff --git a/Makefile b/Makefile index ffd1cf0..5477133 100644 --- a/Makefile +++ b/Makefile @@ -455,7 +455,7 @@ typecheck: make clean for i in "long long" unsigned double; \ do \ - make CFLAGS="-DTYPECHECK -D_TIME_T \"-Dtime_t=$$i\"" ; \ + make CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \ ./zdump -v Europe/Rome ; \ make clean ; \ done diff --git a/asctime.c b/asctime.c index 152b0db..e81b4f0 100644 --- a/asctime.c +++ b/asctime.c @@ -69,7 +69,7 @@ static char buf_asctime[MAX_ASCTIME_BUF_SIZE]; */ char * -asctime_r(register const struct tm *timeptr, char *buf) +asctime_r(const struct tm *timeptr, char *buf) { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" @@ -78,8 +78,8 @@ asctime_r(register const struct tm *timeptr, char *buf) "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - register const char * wn; - register const char * mn; + const char *wn; + const char *mn; char year[INT_STRLEN_MAXIMUM(int) + 2]; char result[MAX_ASCTIME_BUF_SIZE]; @@ -126,7 +126,7 @@ asctime_r(register const struct tm *timeptr, char *buf) */ char * -asctime(register const struct tm *timeptr) +asctime(const struct tm *timeptr) { return asctime_r(timeptr, buf_asctime); } diff --git a/date.c b/date.c index b9578e1..1839397 100644 --- a/date.c +++ b/date.c @@ -85,20 +85,20 @@ static void wildinput(const char *, const char *, int main(const int argc, char *argv[]) { - register const char * format; - register const char * value; - register const char * cp; - register int ch; - register int dousg; - register int aflag = 0; - register int dflag = 0; - register int nflag = 0; - register int tflag = 0; - register int minuteswest; - register int dsttime; - register double adjust; - time_t now; - time_t t; + const char * format; + const char * value; + const char * cp; + int ch; + int dousg; + int aflag = 0; + int dflag = 0; + int nflag = 0; + int tflag = 0; + int minuteswest; + int dsttime; + double adjust; + time_t now; + time_t t; INITIALIZE(dousg); INITIALIZE(minuteswest); @@ -305,9 +305,9 @@ dogmt(void) static char ** fakeenv; if (fakeenv == NULL) { - register int from; - register int to; - register int n; + int from; + int to; + int n; static char tzegmt0[] = "TZ=GMT0"; for (n = 0; environ[n] != NULL; ++n) @@ -343,7 +343,7 @@ dogmt(void) static void reset(const time_t newt, const int nflag) { - register int fid; + int fid; time_t oldt; static struct { struct utmp before; @@ -439,13 +439,17 @@ extern int logwtmp(); #define settimeofday(t, tz) (settimeofday)(t) #endif /* HAVE_SETTIMEOFDAY == 1 */ +#ifdef TSP_SETDATE +static int netsettime(struct timeval); +#endif + #ifndef TSP_SETDATE /*ARGSUSED*/ #endif /* !defined TSP_SETDATE */ static void reset(const time_t newt, const int nflag) { - register const char * username; + const char * username; static struct timeval tv; /* static so tv_usec is 0 */ #ifdef EBUG @@ -491,7 +495,7 @@ errensure(void) } static const char * -nondigit(register const char *cp) +nondigit(const char *cp) { while (is_digit(*cp)) ++cp; @@ -573,8 +577,7 @@ timeout(FILE *const fp, const char *const format, const struct tm *const tmp) } static int -sametm(register const struct tm *const atmp, - register const struct tm *const btmp) +sametm(const struct tm *const atmp, const struct tm *const btmp) { return atmp->tm_year == btmp->tm_year && atmp->tm_mon == btmp->tm_mon && @@ -592,11 +595,11 @@ sametm(register const struct tm *const atmp, #define ATOI2(ar) (ar[0] - '0') * 10 + (ar[1] - '0'); ar += 2; static time_t -convert(register const char * const value, const int dousg, const time_t t) +convert(const char * const value, const int dousg, const time_t t) { - register const char * cp; - register const char * dotp; - register int cent, year_in_cent, month, hour, day, mins, secs; + const char * cp; + const char * dotp; + int cent, year_in_cent, month, hour, day, mins, secs; struct tm tm, outtm; time_t outt; @@ -704,8 +707,8 @@ checkfinal(const char * const value, time_t othert; struct tm tm; struct tm othertm; - register int pass; - register long offset; + int pass; + long offset; /* ** See if there's both a USG and a BSD interpretation. @@ -800,6 +803,7 @@ iffy(const time_t thist, const time_t thatt, * notifies the master that a correction is needed. * Returns 1 on success, 0 on failure. */ +static int netsettime(struct timeval ntv) { int s, length, port, timed_ack, found, err; @@ -812,7 +816,7 @@ netsettime(struct timeval ntv) struct sockaddr_in sin, dest, from; sp = getservbyname("timed", "udp"); - if (sp == 0) { + if (! sp) { fputs(_("udp/timed: unknown service\n"), stderr); retval = 2; return (0); @@ -869,7 +873,7 @@ loop: tout.tv_usec = 0; FD_ZERO(&ready); FD_SET(s, &ready); - found = select(FD_SETSIZE, &ready, 0, 0, &tout); + found = select(FD_SETSIZE, &ready, NULL, NULL, &tout); length = sizeof err; if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char *)&err, &length) == 0 && err) { diff --git a/ialloc.c b/ialloc.c index b6f0188..6a565c6 100644 --- a/ialloc.c +++ b/ialloc.c @@ -10,8 +10,8 @@ char * icatalloc(char *const old, const char *const new) { - register char * result; - register int oldsize, newsize; + char * result; + int oldsize, newsize; newsize = (new == NULL) ? 0 : strlen(new); if (old == NULL) diff --git a/localtime.c b/localtime.c index e074c54..b045b93 100644 --- a/localtime.c +++ b/localtime.c @@ -226,8 +226,8 @@ time_t altzone = 0; static long detzcode(const char *const codep) { - register long result; - register int i; + long result; + int i; result = (codep[0] & 0x80) ? ~0L : 0; for (i = 0; i < 4; ++i) @@ -238,8 +238,8 @@ detzcode(const char *const codep) static time_t detzcode64(const char *const codep) { - register time_t result; - register int i; + time_t result; + int i; result = (codep[0] & 0x80) ? (~(int_fast64_t) 0) : 0; for (i = 0; i < 8; ++i) @@ -250,8 +250,8 @@ detzcode64(const char *const codep) static void settzname(void) { - register struct state * const sp = lclptr; - register int i; + struct state * const sp = lclptr; + int i; tzname[0] = wildabbr; tzname[1] = wildabbr; @@ -272,7 +272,7 @@ settzname(void) ** And to get the latest zone names into tzname. . . */ for (i = 0; i < sp->timecnt; ++i) { - register const struct ttinfo * const ttisp = + const struct ttinfo * const ttisp = &sp->ttis[ sp->types[i]]; @@ -300,8 +300,8 @@ settzname(void) ** Second, truncate long abbreviations. */ for (i = 0; i < sp->typecnt; ++i) { - register const struct ttinfo * const ttisp = &sp->ttis[i]; - register char * cp = &sp->chars[ttisp->tt_abbrind]; + const struct ttinfo * const ttisp = &sp->ttis[i]; + char * cp = &sp->chars[ttisp->tt_abbrind]; if (strlen(cp) > TZ_ABBR_MAX_LEN && strcmp(cp, GRANDPARENTED) != 0) @@ -319,14 +319,13 @@ differ_by_repeat(const time_t t1, const time_t t0) } static int -tzload(register const char *name, register struct state *const sp, - register const int doextend) +tzload(const char *name, struct state *const sp, const int doextend) { - register const char * p; - register int i; - register int fid; - register int stored; - register int nread; + const char * p; + int i; + int fid; + int stored; + int nread; typedef union { struct tzhead tzhead; char buf[2 * sizeof(struct tzhead) + @@ -334,21 +333,21 @@ tzload(register const char *name, register struct state *const sp, 4 * TZ_MAX_TIMES]; } u_t; #ifdef ALL_STATE - register u_t * up; + u_t * up; up = (u_t *) calloc(1, sizeof *up); if (up == NULL) return -1; #else /* !defined ALL_STATE */ - u_t u; - register u_t * const up = &u; + u_t u; + u_t * const up = &u; #endif /* !defined ALL_STATE */ sp->goback = sp->goahead = FALSE; if (name == NULL && (name = TZDEFAULT) == NULL) goto oops; { - register int doaccess; + int doaccess; /* ** Section 4.9.1 of the C standard says that ** "FILENAME_MAX expands to an integral constant expression @@ -422,7 +421,7 @@ tzload(register const char *name, register struct state *const sp, goto oops; } for (i = 0; i < sp->typecnt; ++i) { - register struct ttinfo * ttisp; + struct ttinfo * ttisp; ttisp = &sp->ttis[i]; ttisp->tt_gmtoff = detzcode(p); @@ -439,7 +438,7 @@ tzload(register const char *name, register struct state *const sp, sp->chars[i] = *p++; sp->chars[i] = '\0'; /* ensure '\0' at end */ for (i = 0; i < sp->leapcnt; ++i) { - register struct lsinfo * lsisp; + struct lsinfo * lsisp; lsisp = &sp->lsis[i]; lsisp->ls_trans = (stored == 4) ? @@ -449,7 +448,7 @@ tzload(register const char *name, register struct state *const sp, p += 4; } for (i = 0; i < sp->typecnt; ++i) { - register struct ttinfo * ttisp; + struct ttinfo * ttisp; ttisp = &sp->ttis[i]; if (ttisstdcnt == 0) @@ -462,7 +461,7 @@ tzload(register const char *name, register struct state *const sp, } } for (i = 0; i < sp->typecnt; ++i) { - register struct ttinfo * ttisp; + struct ttinfo * ttisp; ttisp = &sp->ttis[i]; if (ttisgmtcnt == 0) @@ -491,7 +490,7 @@ tzload(register const char *name, register struct state *const sp, /* ** Ignore the beginning (harder). */ - register int j; + int j; for (j = 0; j + i < sp->timecnt; ++j) { sp->ats[j] = sp->ats[j + i]; @@ -519,7 +518,7 @@ tzload(register const char *name, register struct state *const sp, up->buf[0] == '\n' && up->buf[nread - 1] == '\n' && sp->typecnt + 2 <= TZ_MAX_TYPES) { struct state ts; - register int result; + int result; up->buf[nread - 1] = '\0'; result = tzparse(&up->buf[1], &ts, FALSE); @@ -580,15 +579,15 @@ oops: static int typesequiv(const struct state *const sp, const int a, const int b) { - register int result; + int result; if (sp == NULL || a < 0 || a >= sp->typecnt || b < 0 || b >= sp->typecnt) result = FALSE; else { - register const struct ttinfo * ap = &sp->ttis[a]; - register const struct ttinfo * bp = &sp->ttis[b]; + const struct ttinfo * ap = &sp->ttis[a]; + const struct ttinfo * bp = &sp->ttis[b]; result = ap->tt_gmtoff == bp->tt_gmtoff && ap->tt_isdst == bp->tt_isdst && ap->tt_ttisstd == bp->tt_ttisstd && @@ -615,9 +614,9 @@ static const int year_lengths[2] = { */ static const char * -getzname(register const char *strp) +getzname(const char *strp) { - register char c; + char c; while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' && c != '+') @@ -635,9 +634,9 @@ getzname(register const char *strp) */ static const char * -getqzname(register const char *strp, const int delim) +getqzname(const char *strp, const int delim) { - register int c; + int c; while ((c = *strp) != '\0' && c != delim) ++strp; @@ -652,10 +651,10 @@ getqzname(register const char *strp, const int delim) */ static const char * -getnum(register const char *strp, int *const nump, const int min, const int max) +getnum(const char *strp, int *const nump, const int min, const int max) { - register char c; - register int num; + char c; + int num; if (strp == NULL || !is_digit(c = *strp)) return NULL; @@ -681,7 +680,7 @@ getnum(register const char *strp, int *const nump, const int min, const int max) */ static const char * -getsecs(register const char *strp, long *const secsp) +getsecs(const char *strp, long *const secsp) { int num; @@ -721,9 +720,9 @@ getsecs(register const char *strp, long *const secsp) */ static const char * -getoffset(register const char *strp, long *const offsetp) +getoffset(const char *strp, long *const offsetp) { - register int neg = 0; + int neg = 0; if (*strp == '-') { neg = 1; @@ -746,7 +745,7 @@ getoffset(register const char *strp, long *const offsetp) */ static const char * -getrule(const char *strp, register struct rule *const rulep) +getrule(const char *strp, struct rule *const rulep) { if (*strp == 'J') { /* @@ -799,12 +798,12 @@ getrule(const char *strp, register struct rule *const rulep) static time_t transtime(const time_t janfirst, const int year, - register const struct rule *const rulep, const long offset) + const struct rule *const rulep, const long offset) { - register int leapyear; - register time_t value; - register int i; - int d, m1, yy0, yy1, yy2, dow; + int leapyear; + time_t value; + int i; + int d, m1, yy0, yy1, yy2, dow; INITIALIZE(value); leapyear = isleap(year); @@ -890,20 +889,20 @@ transtime(const time_t janfirst, const int year, */ static int -tzparse(const char *name, register struct state *const sp, +tzparse(const char *name, struct state *const sp, const int lastditch) { - const char * stdname; - const char * dstname; - size_t stdlen; - size_t dstlen; - long stdoffset; - long dstoffset; - register time_t * atp; - register unsigned char * typep; - register char * cp; - register int load_result; - static struct ttinfo zttinfo; + const char * stdname; + const char * dstname; + size_t stdlen; + size_t dstlen; + long stdoffset; + long dstoffset; + time_t * atp; + unsigned char * typep; + char * cp; + int load_result; + static struct ttinfo zttinfo; INITIALIZE(dstname); stdname = name; @@ -958,8 +957,8 @@ tzparse(const char *name, register struct state *const sp, if (*name == ',' || *name == ';') { struct rule start; struct rule end; - register int year; - register time_t janfirst; + int year; + time_t janfirst; time_t starttime; time_t endtime; @@ -1016,12 +1015,12 @@ tzparse(const char *name, register struct state *const sp, janfirst = newfirst; } } else { - register long theirstdoffset; - register long theirdstoffset; - register long theiroffset; - register int isdst; - register int i; - register int j; + long theirstdoffset; + long theirdstoffset; + long theiroffset; + int isdst; + int i; + int j; if (*name != '\0') return -1; @@ -1163,7 +1162,7 @@ tzsetwall(void) void tzset(void) { - register const char * name; + const char * name; name = getenv("TZ"); if (name == NULL) { @@ -1216,11 +1215,11 @@ tzset(void) static struct tm * localsub(const time_t *const timep, const long offset, struct tm *const tmp) { - register struct state * sp; - register const struct ttinfo * ttisp; - register int i; - register struct tm * result; - const time_t t = *timep; + struct state * sp; + const struct ttinfo * ttisp; + int i; + struct tm * result; + const time_t t = *timep; sp = lclptr; #ifdef ALL_STATE @@ -1229,10 +1228,10 @@ localsub(const time_t *const timep, const long offset, struct tm *const tmp) #endif /* defined ALL_STATE */ if ((sp->goback && t < sp->ats[0]) || (sp->goahead && t > sp->ats[sp->timecnt - 1])) { - time_t newt = t; - register time_t seconds; - register time_t tcycles; - register int_fast64_t icycles; + time_t newt = t; + time_t seconds; + time_t tcycles; + int_fast64_t icycles; if (t < sp->ats[0]) seconds = sp->ats[0] - t; @@ -1254,7 +1253,7 @@ localsub(const time_t *const timep, const long offset, struct tm *const tmp) return NULL; /* "cannot happen" */ result = localsub(&newt, offset, tmp); if (result == tmp) { - register time_t newy; + time_t newy; newy = tmp->tm_year; if (t < sp->ats[0]) @@ -1274,11 +1273,11 @@ localsub(const time_t *const timep, const long offset, struct tm *const tmp) break; } } else { - register int lo = 1; - register int hi = sp->timecnt; + int lo = 1; + int hi = sp->timecnt; while (lo < hi) { - register int mid = (lo + hi) >> 1; + int mid = (lo + hi) >> 1; if (t < sp->ats[mid]) hi = mid; @@ -1326,7 +1325,7 @@ localtime_r(const time_t *const timep, struct tm *tmp) static struct tm * gmtsub(const time_t *const timep, const long offset, struct tm *const tmp) { - register struct tm * result; + struct tm * result; if (!gmt_is_set) { gmt_is_set = TRUE; @@ -1391,7 +1390,7 @@ offtime(const time_t *const timep, const long offset) */ static int -leaps_thru_end_of(register const int y) +leaps_thru_end_of(const int y) { return (y >= 0) ? (y / 4 - y / 100 + y / 400) : -(leaps_thru_end_of(-(y + 1)) + 1); @@ -1399,18 +1398,18 @@ leaps_thru_end_of(register const int y) static struct tm * timesub(const time_t *const timep, const long offset, - register const struct state *const sp, - register struct tm *const tmp) + const struct state *const sp, + struct tm *const tmp) { - register const struct lsinfo * lp; - register time_t tdays; - register int idays; /* unsigned would be so 2003 */ - register long rem; - int y; - register const int * ip; - register long corr; - register int hit; - register int i; + const struct lsinfo * lp; + time_t tdays; + int idays; /* unsigned would be so 2003 */ + long rem; + int y; + const int * ip; + long corr; + int hit; + int i; corr = 0; hit = 0; @@ -1444,10 +1443,10 @@ timesub(const time_t *const timep, const long offset, tdays = *timep / SECSPERDAY; rem = *timep - tdays * SECSPERDAY; while (tdays < 0 || tdays >= year_lengths[isleap(y)]) { - int newy; - register time_t tdelta; - register int idelta; - register int leapdays; + int newy; + time_t tdelta; + int idelta; + int leapdays; tdelta = tdays / DAYSPERLYEAR; idelta = tdelta; @@ -1465,7 +1464,7 @@ timesub(const time_t *const timep, const long offset, y = newy; } { - register long seconds; + long seconds; seconds = tdays * SECSPERDAY + 0.5; tdays = seconds / SECSPERDAY; @@ -1569,7 +1568,7 @@ ctime_r(const time_t *const timep, char *buf) static int increment_overflow(int *const ip, int j) { - register int const i = *ip; + int const i = *ip; /* ** If i >= 0 there can only be overflow if i + j > INT_MAX @@ -1586,7 +1585,7 @@ increment_overflow(int *const ip, int j) static int long_increment_overflow(long *const lp, int const m) { - register long const l = *lp; + long const l = *lp; if ((l >= 0) ? (m > LONG_MAX - l) : (m < LONG_MIN - l)) return TRUE; @@ -1597,7 +1596,7 @@ long_increment_overflow(long *const lp, int const m) static int normalize_overflow(int *const tensptr, int *const unitsptr, const int base) { - register int tensdelta; + int tensdelta; tensdelta = (*unitsptr >= 0) ? (*unitsptr / base) : @@ -1609,7 +1608,7 @@ normalize_overflow(int *const tensptr, int *const unitsptr, const int base) static int long_normalize_overflow(long *const tensptr, int *const unitsptr, const int base) { - register int tensdelta; + int tensdelta; tensdelta = (*unitsptr >= 0) ? (*unitsptr / base) : @@ -1619,10 +1618,10 @@ long_normalize_overflow(long *const tensptr, int *const unitsptr, const int base } static int -tmcomp(register const struct tm *const atmp, - register const struct tm *const btmp) +tmcomp(const struct tm *const atmp, + const struct tm *const btmp) { - register int result; + int result; if ((result = (atmp->tm_year - btmp->tm_year)) == 0 && (result = (atmp->tm_mon - btmp->tm_mon)) == 0 && @@ -1640,17 +1639,17 @@ time2sub(struct tm *const tmp, int *const okayp, const int do_norm_secs) { - register const struct state * sp; - register int dir; - register int i, j; - register int saved_seconds; - register long li; - register time_t lo; - register time_t hi; - long y; - time_t newt; - time_t t; - struct tm yourtm, mytm; + const struct state * sp; + int dir; + int i, j; + int saved_seconds; + long li; + time_t lo; + time_t hi; + long y; + time_t newt; + time_t t; + struct tm yourtm, mytm; *okayp = FALSE; yourtm = *tmp; @@ -1838,15 +1837,15 @@ time1(struct tm *const tmp, struct tm *(*const funcp) (const time_t *, long, struct tm *), const long offset) { - register time_t t; - register const struct state * sp; - register int samei, otheri; - register int sameind, otherind; - register int i; - register int nseen; - int seen[TZ_MAX_TYPES]; - int types[TZ_MAX_TYPES]; - int okay; + time_t t; + const struct state * sp; + int samei, otheri; + int sameind, otherind; + int i; + int nseen; + int seen[TZ_MAX_TYPES]; + int types[TZ_MAX_TYPES]; + int okay; if (tmp == NULL) { errno = EINVAL; @@ -1980,9 +1979,9 @@ gtime(struct tm *const tmp) static long leapcorr(time_t *timep) { - register struct state * sp; - register struct lsinfo * lp; - register int i; + struct state * sp; + struct lsinfo * lp; + int i; sp = lclptr; i = sp->leapcnt; diff --git a/scheck.c b/scheck.c index ed60980..95bb716 100644 --- a/scheck.c +++ b/scheck.c @@ -10,12 +10,12 @@ const char * scheck(const char *const string, const char *const format) { - register char * fbuf; - register const char * fp; - register char * tp; - register int c; - register const char * result; - char dummy; + char * fbuf; + const char * fp; + char * tp; + int c; + const char * result; + char dummy; result = ""; if (string == NULL || format == NULL) diff --git a/strftime.c b/strftime.c index 4950f74..5b302ac 100644 --- a/strftime.c +++ b/strftime.c @@ -587,8 +587,8 @@ static char * _yconv(const int a, const int b, const int convert_top, const int convert_yy, char *pt, const char *const ptlim) { - register int lead; - register int trail; + int lead; + int trail; #define DIVISOR 100 trail = a % DIVISOR + b % DIVISOR; diff --git a/zdump.c b/zdump.c index 6caa7a2..ddb46b9 100644 --- a/zdump.c +++ b/zdump.c @@ -17,6 +17,7 @@ #include "time.h" /* for struct tm */ #include "stdlib.h" /* for exit, malloc, atoi */ #include "float.h" /* for FLT_MAX and DBL_MAX */ +#include "limits.h" /* for CHAR_BIT, LLONG_MAX */ #include "ctype.h" /* for isalpha et al. */ #ifndef isascii #define isascii(x) 1 @@ -150,8 +151,35 @@ extern char * optarg; extern int optind; extern char * tzname[2]; -static time_t absolute_min_time; -static time_t absolute_max_time; +/* The minimum and maximum finite time values. Shift 'long long' or + 'long' instead of 'time_t'; this avoids compile-time errors when + time_t is floating-point. In practice, 'long long' is wide enough. */ +static time_t const absolute_min_time = + ((time_t) 0.5 == 0.5 + ? (sizeof (time_t) == sizeof (float) ? (time_t) -FLT_MAX + : sizeof (time_t) == sizeof (double) ? (time_t) -DBL_MAX + : sizeof (time_t) == sizeof (long double) ? (time_t) -LDBL_MAX + : 0) + : (time_t) -1 < 0 +#ifdef LLONG_MAX + ? (time_t) ((long long) -1 << (CHAR_BIT * sizeof (time_t) - 1)) +#else + ? (time_t) ((long) -1 << (CHAR_BIT * sizeof (time_t) - 1)) +#endif + : 0); +static time_t const absolute_max_time = + ((time_t) 0.5 == 0.5 + ? (sizeof (time_t) == sizeof (float) ? (time_t) FLT_MAX + : sizeof (time_t) == sizeof (double) ? (time_t) DBL_MAX + : sizeof (time_t) == sizeof (long double) ? (time_t) LDBL_MAX + : -1) + : (time_t) -1 < 0 +#ifdef LLONG_MAX + ? (time_t) (- (~ 0 < 0) - ((long long) -1 << (CHAR_BIT * sizeof (time_t) - 1))) +#else + ? (time_t) (- (~ 0 < 0) - ((long) -1 << (CHAR_BIT * sizeof (time_t) - 1))) +#endif + : (time_t) -1); static size_t longest; static char * progname; static int warned; @@ -161,7 +189,7 @@ static void abbrok(const char * abbrp, const char * zone); static long delta(struct tm * newp, struct tm * oldp) ATTRIBUTE_PURE; static void dumptime(const struct tm * tmp); static time_t hunt(char * name, time_t lot, time_t hit); -static void setabsolutes(void); +static void checkabsolutes(void); static void show(char * zone, time_t t, int v); static const char * tformat(void); static time_t yeartot(long y) ATTRIBUTE_PURE; @@ -172,12 +200,12 @@ static time_t yeartot(long y) ATTRIBUTE_PURE; static struct tm * my_localtime(time_t *tp) { - register struct tm * tmp; + struct tm * tmp; tmp = localtime(tp); if (tp != NULL && tmp != NULL) { struct tm tm; - register time_t t; + time_t t; tm = *tmp; t = mktime(&tm); @@ -205,8 +233,8 @@ my_localtime(time_t *tp) static void abbrok(const char *const abbrp, const char *const zone) { - register const char * cp; - register const char * wp; + const char * cp; + const char * wp; if (warned) return; @@ -252,22 +280,22 @@ Report bugs to tz(a)elsie.nci.nih.gov.\n"), int main(int argc, char *argv[]) { - register int i; - register int c; - register int vflag; - register char * cutarg; - register long cutloyear = ZDUMP_LO_YEAR; - register long cuthiyear = ZDUMP_HI_YEAR; - register time_t cutlotime; - register time_t cuthitime; - register char ** fakeenv; - time_t now; - time_t t; - time_t newt; - struct tm tm; - struct tm newtm; - register struct tm * tmp; - register struct tm * newtmp; + int i; + int c; + int vflag; + char * cutarg; + long cutloyear = ZDUMP_LO_YEAR; + long cuthiyear = ZDUMP_HI_YEAR; + time_t cutlotime; + time_t cuthitime; + char ** fakeenv; + time_t now; + time_t t; + time_t newt; + struct tm tm; + struct tm newtm; + struct tm * tmp; + struct tm * newtmp; INITIALIZE(cutlotime); INITIALIZE(cuthitime); @@ -314,7 +342,7 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } } - setabsolutes(); + checkabsolutes(); cutlotime = yeartot(cutloyear); cuthitime = yeartot(cuthiyear); } @@ -324,8 +352,8 @@ main(int argc, char *argv[]) if (strlen(argv[i]) > longest) longest = strlen(argv[i]); { - register int from; - register int to; + int from; + int to; for (i = 0; environ[i] != NULL; ++i) continue; @@ -404,56 +432,22 @@ main(int argc, char *argv[]) } static void -setabsolutes(void) +checkabsolutes(void) { - if (0.5 == (time_t) 0.5) { - /* - ** time_t is floating. - */ - if (sizeof (time_t) == sizeof (float)) { - absolute_min_time = (time_t) -FLT_MAX; - absolute_max_time = (time_t) FLT_MAX; - } else if (sizeof (time_t) == sizeof (double)) { - absolute_min_time = (time_t) -DBL_MAX; - absolute_max_time = (time_t) DBL_MAX; - } else { - (void) fprintf(stderr, + if (absolute_max_time < absolute_min_time) { + (void) fprintf(stderr, _("%s: use of -v on system with floating time_t other than float or double\n"), - progname); - exit(EXIT_FAILURE); - } - } else if (0 > (time_t) -1) { - /* - ** time_t is signed. Assume overflow wraps around. - */ - time_t t = 0; - time_t t1 = 1; - - while (t < t1) { - t = t1; - t1 = 2 * t1 + 1; - } - - absolute_max_time = t; - t = -t; - absolute_min_time = t - 1; - if (t < absolute_min_time) - absolute_min_time = t; - } else { - /* - ** time_t is unsigned. - */ - absolute_min_time = 0; - absolute_max_time = absolute_min_time - 1; + progname); + exit(EXIT_FAILURE); } } static time_t yeartot(const long y) { - register long myy; - register long seconds; - register time_t t; + long myy; + long seconds; + time_t t; myy = EPOCH_YEAR; t = 0; @@ -482,13 +476,13 @@ yeartot(const long y) static time_t hunt(char *name, time_t lot, time_t hit) { - time_t t; - long diff; - struct tm lotm; - register struct tm * lotmp; - struct tm tm; - register struct tm * tmp; - char loab[MAX_STRING_LENGTH]; + time_t t; + long diff; + struct tm lotm; + struct tm * lotmp; + struct tm tm; + struct tm * tmp; + char loab[MAX_STRING_LENGTH]; lotmp = my_localtime(&lot); if (lotmp != NULL) { @@ -529,8 +523,8 @@ hunt(char *name, time_t lot, time_t hit) static long delta(struct tm * newp, struct tm *oldp) { - register long result; - register int tmy; + long result; + int tmy; if (newp->tm_year < oldp->tm_year) return -delta(oldp, newp); @@ -550,7 +544,7 @@ delta(struct tm * newp, struct tm *oldp) static void show(char *zone, time_t t, int v) { - register struct tm * tmp; + struct tm * tmp; (void) printf("%-*s ", (int) longest, zone); if (v) { @@ -583,7 +577,7 @@ show(char *zone, time_t t, int v) static char * abbr(struct tm *tmp) { - register char * result; + char * result; static char nada; if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1) @@ -620,7 +614,7 @@ tformat(void) } static void -dumptime(register const struct tm *timeptr) +dumptime(const struct tm *timeptr) { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" @@ -629,10 +623,10 @@ dumptime(register const struct tm *timeptr) "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - register const char * wn; - register const char * mn; - register int lead; - register int trail; + const char * wn; + const char * mn; + int lead; + int trail; if (timeptr == NULL) { (void) printf("NULL"); diff --git a/zic.c b/zic.c index 64af1b2..28b2a24 100644 --- a/zic.c +++ b/zic.c @@ -440,9 +440,9 @@ static const char * yitcommand; int main(int argc, char **argv) { - register int i; - register int j; - register int c; + int i; + int j; + int c; #ifdef unix (void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH)); @@ -579,8 +579,8 @@ _("%s: More than one -L option specified\n"), static void dolink(const char *const fromfield, const char *const tofield) { - register char * fromname; - register char * toname; + char * fromname; + char * toname; if (fromfield[0] == '/') fromname = ecpyalloc(fromfield); @@ -614,7 +614,7 @@ dolink(const char *const fromfield, const char *const tofield) access(fromname, F_OK) == 0 && !itsdir(fromname)) { const char *s = tofield; - register char * symlinkcontents = NULL; + char *symlinkcontents = NULL; while ((s = strchr(s+1, '/')) != NULL) symlinkcontents = @@ -651,8 +651,8 @@ static const zic_t max_time = -1 - ((zic_t) -1 << (TIME_T_BITS_IN_FILE - 1)); static int itsdir(const char *const name) { - register char * myname; - register int accres; + char * myname; + int accres; myname = ecpyalloc(name); myname = ecatalloc(myname, "/."); @@ -679,10 +679,10 @@ rcomp(const void *cp1, const void *cp2) static void associate(void) { - register struct zone * zp; - register struct rule * rp; - register int base, out; - register int i, j; + struct zone * zp; + struct rule * rp; + int base, out; + int i, j; if (nrules != 0) { (void) qsort(rules, nrules, sizeof *rules, rcomp); @@ -754,14 +754,14 @@ associate(void) static void infile(const char *name) { - register FILE * fp; - register char ** fields; - register char * cp; - register const struct lookup * lp; - register int nfields; - register int wantcont; - register int num; - char buf[BUFSIZ]; + FILE * fp; + char ** fields; + char * cp; + const struct lookup * lp; + int nfields; + int wantcont; + int num; + char buf[BUFSIZ]; if (strcmp(name, "-") == 0) { name = _("standard input"); @@ -897,7 +897,7 @@ warning(_("values over 24 hours not handled by pre-2007 versions of zic")); } static void -inrule(register char **const fields, const int nfields) +inrule(char **const fields, const int nfields) { static struct rule r; @@ -923,9 +923,9 @@ inrule(register char **const fields, const int nfields) } static int -inzone(register char **const fields, const int nfields) +inzone(char **const fields, const int nfields) { - register int i; + int i; static char * buf; if (nfields < ZONE_MINFIELDS || nfields > ZONE_MAXFIELDS) { @@ -966,7 +966,7 @@ _("duplicate zone name %s (file \"%s\", line %d)"), } static int -inzcont(register char **const fields, const int nfields) +inzcont(char **const fields, const int nfields) { if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS) { error(_("wrong number of fields on Zone continuation line")); @@ -976,14 +976,14 @@ inzcont(register char **const fields, const int nfields) } static int -inzsub(register char **const fields, const int nfields, const int iscont) +inzsub(char **const fields, const int nfields, const int iscont) { - register char * cp; + char * cp; static struct zone z; - register int i_gmtoff, i_rule, i_format; - register int i_untilyear, i_untilmonth; - register int i_untilday, i_untiltime; - register int hasuntil; + int i_gmtoff, i_rule, i_format; + int i_untilyear, i_untilmonth; + int i_untilday, i_untiltime; + int hasuntil; if (iscont) { i_gmtoff = ZFC_GMTOFF; @@ -1053,14 +1053,14 @@ inzsub(register char **const fields, const int nfields, const int iscont) } static void -inleap(register char ** const fields, const int nfields) +inleap(char ** const fields, const int nfields) { - register const char * cp; - register const struct lookup * lp; - register int i, j; - int year, month, day; - long dayoff, tod; - zic_t t; + const char * cp; + const struct lookup * lp; + int i, j; + int year, month, day; + long dayoff, tod; + zic_t t; if (nfields != LEAP_FIELDS) { error(_("wrong number of fields on Leap line")); @@ -1125,8 +1125,8 @@ inleap(register char ** const fields, const int nfields) tod = gethms(fields[LP_TIME], _("invalid time of day"), FALSE); cp = fields[LP_CORR]; { - register int positive; - int count; + int positive; + int count; if (strcmp(cp, "") == 0) { /* infile() turns "-" into "" */ positive = FALSE; @@ -1155,7 +1155,7 @@ inleap(register char ** const fields, const int nfields) } static void -inlink(register char **const fields, const int nfields) +inlink(char **const fields, const int nfields) { struct link l; @@ -1180,7 +1180,7 @@ inlink(register char **const fields, const int nfields) } static void -rulesub(register struct rule *const rp, +rulesub(struct rule *const rp, const char *const loyearp, const char *const hiyearp, const char *const typep, @@ -1188,10 +1188,10 @@ rulesub(register struct rule *const rp, const char *const dayp, const char *const timep) { - register const struct lookup * lp; - register const char * cp; - register char * dp; - register char * ep; + const struct lookup * lp; + const char * cp; + char * dp; + char * ep; if ((lp = byword(monthp, mon_names)) == NULL) { error(_("invalid month name")); @@ -1332,8 +1332,8 @@ rulesub(register struct rule *const rp, static void convert(const long val, char *const buf) { - register int i; - register int shift; + int i; + int shift; unsigned char *const b = (unsigned char *) buf; for (i = 0, shift = 24; i < 4; ++i, shift -= 8) @@ -1343,8 +1343,8 @@ convert(const long val, char *const buf) static void convert64(const zic_t val, char *const buf) { - register int i; - register int shift; + int i; + int shift; unsigned char *const b = (unsigned char *) buf; for (i = 0, shift = 56; i < 8; ++i, shift -= 8) @@ -1387,11 +1387,11 @@ is32(const zic_t x) static void writezone(const char *const name, const char *const string) { - register FILE * fp; - register int i, j; - register int leapcnt32, leapi32; - register int timecnt32, timei32; - register int pass; + FILE * fp; + int i, j; + int leapcnt32, leapi32; + int timecnt32, timei32; + int pass; static char * fullname; static const struct tzhead tzh0; static struct tzhead tzh; @@ -1494,15 +1494,15 @@ writezone(const char *const name, const char *const string) } } for (pass = 1; pass <= 2; ++pass) { - register int thistimei, thistimecnt; - register int thisleapi, thisleapcnt; - register int thistimelim, thisleaplim; - int writetype[TZ_MAX_TIMES]; - int typemap[TZ_MAX_TYPES]; - register int thistypecnt; - char thischars[TZ_MAX_CHARS]; - char thischarcnt; - int indmap[TZ_MAX_CHARS]; + int thistimei, thistimecnt; + int thisleapi, thisleapcnt; + int thistimelim, thisleaplim; + int writetype[TZ_MAX_TIMES]; + int typemap[TZ_MAX_TYPES]; + int thistypecnt; + char thischars[TZ_MAX_CHARS]; + char thischarcnt; + int indmap[TZ_MAX_CHARS]; if (pass == 1) { thistimei = timei32; @@ -1546,7 +1546,7 @@ writezone(const char *const name, const char *const string) ** set correctly). */ { - register int mrudst, mrustd, hidst, histd, type; + int mrudst, mrustd, hidst, histd, type; hidst = histd = mrudst = mrustd = -1; for (i = thistimei; i < thistimelim; ++i) @@ -1590,7 +1590,7 @@ writezone(const char *const name, const char *const string) indmap[i] = -1; thischarcnt = 0; for (i = 0; i < typecnt; ++i) { - register char * thisabbr; + char * thisabbr; if (!writetype[i]) continue; @@ -1647,7 +1647,7 @@ writezone(const char *const name, const char *const string) (void) fwrite(thischars, sizeof thischars[0], thischarcnt, fp); for (i = thisleapi; i < thisleaplim; ++i) { - register zic_t todo; + zic_t todo; if (roll[i]) { if (timecnt == 0 || trans[i] < ats[0]) { @@ -1690,9 +1690,9 @@ static void doabbr(char *const abbr, const char *const format, const char *const letters, const int isdst, const int doquotes) { - register char * cp; - register char * slashp; - register int len; + char * cp; + char * slashp; + int len; slashp = strchr(format, '/'); if (slashp == NULL) { @@ -1734,9 +1734,9 @@ updateminmax(const int x) static int stringoffset(char *result, long offset) { - register int hours; - register int minutes; - register int seconds; + int hours; + int minutes; + int seconds; result[0] = '\0'; if (offset < 0) { @@ -1765,11 +1765,11 @@ static int stringrule(char *result, const struct rule *const rp, const long dstoff, const long gmtoff) { - register long tod; + long tod; result = end(result); if (rp->r_dycode == DC_DOM) { - register int month, total; + int month, total; if (rp->r_dayofmonth == 29 && rp->r_month == TM_FEBRUARY) return -1; @@ -1778,7 +1778,7 @@ stringrule(char *result, const struct rule *const rp, const long dstoff, total += len_months[0][month]; (void) sprintf(result, "J%d", total + rp->r_dayofmonth); } else { - register int week; + int week; if (rp->r_dycode == DC_DOWGEQ) { if ((rp->r_dayofmonth % DAYSPERWEEK) != 1) @@ -1816,12 +1816,12 @@ stringrule(char *result, const struct rule *const rp, const long dstoff, static void stringzone(char *result, const struct zone *const zpfirst, const int zonecount) { - register const struct zone * zp; - register struct rule * rp; - register struct rule * stdrp; - register struct rule * dstrp; - register int i; - register const char * abbrvar; + const struct zone * zp; + struct rule * rp; + struct rule * stdrp; + struct rule * dstrp; + int i; + const char * abbrvar; result[0] = '\0'; zp = zpfirst + zonecount - 1; @@ -1896,24 +1896,24 @@ stringzone(char *result, const struct zone *const zpfirst, const int zonecount) static void outzone(const struct zone * const zpfirst, const int zonecount) { - register const struct zone * zp; - register struct rule * rp; - register int i, j; - register int usestart, useuntil; - register zic_t starttime, untiltime; - register long gmtoff; - register long stdoff; - register int year; - register long startoff; - register int startttisstd; - register int startttisgmt; - register int type; - register char * startbuf; - register char * ab; - register char * envvar; - register int max_abbr_len; - register int max_envvar_len; - register int prodstic; /* all rules are min to max */ + const struct zone * zp; + struct rule * rp; + int i, j; + int usestart, useuntil; + zic_t starttime, untiltime; + long gmtoff; + long stdoff; + int year; + long startoff; + int startttisstd; + int startttisgmt; + int type; + char * startbuf; + char * ab; + char * envvar; + int max_abbr_len; + int max_envvar_len; + int prodstic; /* all rules are min to max */ max_abbr_len = 2 + max_format_len + max_abbrvar_len; max_envvar_len = 2 * max_abbr_len + 5 * 9; @@ -1959,7 +1959,7 @@ outzone(const struct zone * const zpfirst, const int zonecount) */ stringzone(envvar, zpfirst, zonecount); if (noise && envvar[0] == '\0') { - register char * wp; + char * wp; wp = ecpyalloc(_("no POSIX environment variable for zone")); wp = ecatalloc(wp, " "); @@ -2037,9 +2037,9 @@ wp = ecpyalloc(_("no POSIX environment variable for zone")); rp->r_temp = rpytime(rp, year); } for ( ; ; ) { - register int k; - register zic_t jtime, ktime; - register long offset; + int k; + zic_t jtime, ktime; + long offset; INITIALIZE(ktime); if (useuntil) { @@ -2184,7 +2184,7 @@ static int addtype(const long gmtoff, const char *const abbr, const int isdst, const int ttisstd, const int ttisgmt) { - register int i, j; + int i, j; if (isdst != TRUE && isdst != FALSE) { error(_("internal error - addtype called with bad isdst")); @@ -2239,7 +2239,7 @@ addtype(const long gmtoff, const char *const abbr, const int isdst, static void leapadd(const zic_t t, const int positive, const int rolling, int count) { - register int i, j; + int i, j; if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS) { error(_("too many leap seconds")); @@ -2269,8 +2269,8 @@ leapadd(const zic_t t, const int positive, const int rolling, int count) static void adjleap(void) { - register int i; - register long last = 0; + int i; + long last = 0; /* ** propagate leap seconds forward @@ -2314,7 +2314,7 @@ lowerit(int a) /* case-insensitive equality */ static ATTRIBUTE_PURE int -ciequal(register const char *ap, register const char *bp) +ciequal(const char *ap, const char *bp) { while (lowerit(*ap) == lowerit(*bp++)) if (*ap++ == '\0') @@ -2323,7 +2323,7 @@ ciequal(register const char *ap, register const char *bp) } static ATTRIBUTE_PURE int -itsabbr(register const char *abbr, register const char *word) +itsabbr(const char *abbr, const char *word) { if (lowerit(*abbr) != lowerit(*word)) return FALSE; @@ -2337,11 +2337,11 @@ itsabbr(register const char *abbr, register const char *word) } static ATTRIBUTE_PURE const struct lookup * -byword(register const char *const word, - register const struct lookup *const table) +byword(const char *const word, + const struct lookup *const table) { - register const struct lookup * foundlp; - register const struct lookup * lp; + const struct lookup * foundlp; + const struct lookup * lp; if (word == NULL || table == NULL) return NULL; @@ -2365,11 +2365,11 @@ byword(register const char *const word, } static char ** -getfields(register char *cp) +getfields(char *cp) { - register char * dp; - register char ** array; - register int nsubs; + char * dp; + char ** array; + int nsubs; if (cp == NULL) return NULL; @@ -2434,11 +2434,11 @@ tadd(const zic_t t1, const long t2) */ static zic_t -rpytime(register const struct rule *const rp, register const int wantedy) +rpytime(const struct rule *const rp, const int wantedy) { - register int y, m, i; - register long dayoff; /* with a nod to Margaret O. */ - register zic_t t; + int y, m, i; + long dayoff; /* with a nod to Margaret O. */ + zic_t t; if (wantedy == INT_MIN) return min_time; @@ -2474,7 +2474,7 @@ rpytime(register const struct rule *const rp, register const int wantedy) --i; dayoff = oadd(dayoff, eitol(i)); if (rp->r_dycode == DC_DOWGEQ || rp->r_dycode == DC_DOWLEQ) { - register long wday; + long wday; #define LDAYSPERWEEK ((long) DAYSPERWEEK) wday = eitol(EPOCH_WDAY); @@ -2517,11 +2517,11 @@ will not work with pre-2004 versions of zic")); static void newabbr(const char *const string) { - register int i; + int i; if (strcmp(string, GRANDPARENTED) != 0) { - register const char * cp; - const char * mp; + const char * cp; + const char * mp; /* ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics @@ -2569,8 +2569,8 @@ mp = _("time zone abbreviation differs from POSIX standard"); static int mkdirs(char *argname) { - register char * name; - register char * cp; + char * name; + char * cp; if (argname == NULL || *argname == '\0') return 0; -- 1.7.9.5

1 0

Jordan stays on DST
by Steffen Thorsen Oct. 26, 2012

Oct. 26, 2012

Yesterday the government in Jordan announced that they will not switch back to standard time this winter, so the will stay on DST until about the same time next year (at least). The original plan was to turn clocks back on Friday (2012-10-26): http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?Site_Id=1&lang=2&N… Best regards, Steffen Thorsen - timeanddate.com

3 3

Summer time for Brasil needed in tzdatabase
by Lucas Rancez Oct. 23, 2012

Oct. 23, 2012

Greetings, According to this site: http://pcdsh01.on.br/DecHV.html http://pcdsh01.on.br/FusoBR_HVCorrente.htm >From the 2012-10-21 until 2013-02-17 the Brazilian Estates will be using summer time. For example: the zone America/Sao_Paulo in the tzdata2012g says -3:00 and should be -2:00. Thanks! [Descripción: signature]

2 1

Summer time for Brasil needed in tzdatabase
by Lucas Rancez Oct. 22, 2012

Oct. 22, 2012

Greetings, According to this site: http://pcdsh01.on.br/DecHV.html http://pcdsh01.on.br/FusoBR_HVCorrente.htm >From the 2012-10-21 until 2013-02-17 the Brazilian Estates will be using summer time. For example: the zone America/Sao_Paulo in the tzdata2012g says -3:00 and should be -2:00. Thanks! [Descripción: signature]

1 0

Brazil's summer time: Tocantins is the new state on DST
by Rodrigo Severo Oct. 20, 2012

Oct. 20, 2012

Hi, This years DST time in Brazil has one (or two) new situations: - Tocantins state will have DST. For the new time zone I believe Palmas would be a good option as it's Tocantins capital and most populated city. - Bahia (another state) will not have DST. But I believe it havent' last year already but this has to be checked. Here is a link to a news post in portuguese reporting this changes: http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306,00-TO+subst… Regards, Rodrigo Severo -- *Rodrigo Severo* | DIRETOR DE TECNOLOGIA Tel. *+55 61 3030-1515* Siga a Fábrica no twitter:*@empautaclipping* fabricadeideias.com <http://www.fabricadeideias.com/> 12 ANOS DE TECNOLOGIA E COMUNICAÇÃO NUMA COMBINAÇÃO PERFEITA

5 5

PGP signatures on the FTP server? (was Re: tzcode2012g and tzdata2012g available)
by enh Oct. 20, 2012

Oct. 20, 2012

any chance we can have the PGP files on the FTP sever too, like openssl does (http://www.openssl.org/source/)? if there were a corresponding .md5/.sha1/.asc file, i'd modify Android's tzdata updating script to actually check the signatures. at the moment, with the signature only available in the release mail, it's not obvious how i'd automate this. On Wed, Oct 17, 2012 at 9:39 PM, Paul Eggert <eggert(a)cs.ucla.edu> wrote: > The 2012g release of the tz code and data is available. It reflects > the following changes recently circulated on the tz mailing list: > > Samoa fall 2012 and later. (Thanks to Nicholas Pereira > and Robert Elz.) > > Palestine fall 2012. (Thanks to Steffen Thorsen.) > > Assume C89. > > This release does not reflect the possible changes discussed yesterday > for Tocantins and Bahia; I plan to send out further email about that > soon. Nor does it include the minor C style-code change for NULL > versus 0 -- I plan to get to that the next time around, since it > doesn't affect functionality. > > To attack the version-number problem, this release ships the file > 'Makefile' (which contains the release number) in both the tzcode and > the tzdata tarballs. The two Makefiles are identical, and should be > identical in any matching pair of tarballs, so it shouldn't matter > which order you extract the tarballs. Perhaps we can come up with a > better version-number scheme at some point; this scheme does have the > virtue of not adding more files. > > Here are links to the release files: > > http://www.iana.org/time-zones/repository/releases/tzcode2012g.tar.gz > http://www.iana.org/time-zones/repository/releases/tzdata2012g.tar.gz > > ftp://ftp.iana.org/tz/releases/tzcode2012g.tar.gz > ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz > > As usual, links to the latest release files are here: > > http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz > http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz > > ftp://ftp.iana.org/tz/tzcode-latest.tar.gz > ftp://ftp.iana.org/tz/tzdata-latest.tar.gz > > This release corresponds to commit > ec6a124c84ef45054c84cbe49ee8ebe27473c01c in the unofficial github > repository at <https://github.com/eggert/tz>. > > Here is the GPG checksum for the release files: > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > > iQIcBAABAgAGBQJQf4M1AAoJEO2X6Q5iqn40cgoP/2gNWNwj4ZSXadowHbjoA9QT > 8gqjdw5vXYbIczBei0uwuG5X/yvgiSk57DCbR2XOa7IwPkIom0HbJpL0FYPB8I5D > cMdr7IYbksGXnnVn9mbtiTM06IJRxIU/d6O3c/2yHgv5yJp8JMj4dr746iI4EVGZ > osA1FDefsCpIaE8/axToY83uLaroTKjHAqucQoQ/+5htTTcfoEM/MNX7ZcLS7uxl > alHUNWH2KCxHiYC3HBL04B+dHdY3K3HaOR57TwDbzHSnjcBwa45jaDGBo9fV/0aZ > cpbisJ+5O/IYl4uwUTYpFPrfcy95KxdxaIp/K167uDbc/Nb+rUOY9BjdqGjVyGHt > V749gV1tO4jnzJMUF+sIuvhCDME802NOs2yOnMTltKLNDfivouT8PAxAEF4ozFlJ > gBUtKfWMb2teQpDp64K4bQAZOUFEjW1KuETIPD9oq7tNx2Ohp9QGl08pKxA66OaD > 8GiBqmjA/NzM7xmZqWSMqu6GSrSQnA5PDMZM/B4m79cVYzYoGi7FBLq3hBEKCXKG > y3TWNnVjRXVamHh4cWY3i+1fC+se+DobR/dt/l1abtJ/HdnxNcQQc57eB97yAvQI > Xg7u0Hhf6uqJkGohoyA7CWpr1ArEszBIfgQ4niCTa5anT5KrrQly9Imkt1i+9pdi > SFh0tDFyzyL0Fhcc0VvY > =+Nmz > -----END PGP SIGNATURE----- > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > > iQIcBAABAgAGBQJQf4NJAAoJEO2X6Q5iqn4007sP/R1bciDNZ1CbkCNT4EMVaK8E > PLhql3SsNZrPJYZHm5Ph03uG8YvlY1ysHgSQn9dz/MNQ8eO3oBno06To/1Tn34Rh > W6J0Iyrw9EOuCykke0oF/EmUh2T89DFJUzKbg+3x5UZ8QM+mhHHCL+5wSEm8aY9m > zmleAyhwdh+4kgUvVT6f3IisWY2FCOufQZ7oJx8g1QHuPy1lBI8jLqHbUNWvR0CD > PyAvhEUPGRDfWUM7jkPpN8tK4LE4PAM0OH3lXhOct221heQ05AFr5+N8i+B3z2lR > K0JCeF2QtDtXnkYTKIUMGfXoA7KXTVkAO3gSjcPTusSF6WByLIhiP7I025x9Aglq > BGwy1NxVbdiEv51ibiR9VZs28zqxdTnxKoL6cwkmbWApk6XyG/aCZQXjN+92Mtv0 > eXRgIHeWzlOE7/b7SHi06iU9p23qR9AQNRpFwZqZHCK/tnn1kl6zl+WKjrM6ZhOO > 1WvN1slat57p790+ekld1TbAEU3pto5QZekOMwOdV/5+w3Q09J83AzfNZEeKZS4F > GE/RWo6+nCrFUNBMJkx0uOMwcIWW3lK9FEknrfT/Z27XkDKDRL4j5RdWs+juk2Oq > z3fUJMqb0TRgIgWl1RIsvWCiAXI4XAojD2Qx3zYr4smhcV/rEZ4NiPLoh/lLY6j2 > tuePXzMqu3pQ16Uc/d9h > =8M0s > -----END PGP SIGNATURE----- -- Elliott Hughes - http://who/enh - http://jessies.org/~enh/ NIO, JNI, or bionic questions? Mail me/drop by/add me as a reviewer.

2 1

America/Bahia will not join Brazilian DST in 2012
by Antonio Terceiro Oct. 18, 2012

Oct. 18, 2012

It's been published in the news that the state of Bahia, Brazil, will not be joining the DST this year. http://www.correio24horas.com.br/noticias/detalhes/detalhes-1/artigo/apos-p… http://g1.globo.com/bahia/noticia/2012/10/governador-cancela-adesao-da-bahi… http://atarde.uol.com.br/bahia/materias/1459705-bahia-esta-fora-do-horario-… Since the news came a little late, systems using America/Bahia need to be upgraded ASAP to stay in the correct time after DST starts (Oct 21st, next Sunday). Is it possible to have a new release of tzdata soon so that we can coordinate a quick update? Thanks in advance, -- Antonio Terceiro <terceiro(a)debian.org>

2 1

tzcode2012g and tzdata2012g available
by Paul Eggert Oct. 18, 2012

Oct. 18, 2012

The 2012g release of the tz code and data is available. It reflects the following changes recently circulated on the tz mailing list: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) Assume C89. This release does not reflect the possible changes discussed yesterday for Tocantins and Bahia; I plan to send out further email about that soon. Nor does it include the minor C style-code change for NULL versus 0 -- I plan to get to that the next time around, since it doesn't affect functionality. To attack the version-number problem, this release ships the file 'Makefile' (which contains the release number) in both the tzcode and the tzdata tarballs. The two Makefiles are identical, and should be identical in any matching pair of tarballs, so it shouldn't matter which order you extract the tarballs. Perhaps we can come up with a better version-number scheme at some point; this scheme does have the virtue of not adding more files. Here are links to the release files: http://www.iana.org/time-zones/repository/releases/tzcode2012g.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2012g.tar.gz ftp://ftp.iana.org/tz/releases/tzcode2012g.tar.gz ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz As usual, links to the latest release files are here: http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz ftp://ftp.iana.org/tz/tzcode-latest.tar.gz ftp://ftp.iana.org/tz/tzdata-latest.tar.gz This release corresponds to commit ec6a124c84ef45054c84cbe49ee8ebe27473c01c in the unofficial github repository at <https://github.com/eggert/tz>. Here is the GPG checksum for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQf4M1AAoJEO2X6Q5iqn40cgoP/2gNWNwj4ZSXadowHbjoA9QT 8gqjdw5vXYbIczBei0uwuG5X/yvgiSk57DCbR2XOa7IwPkIom0HbJpL0FYPB8I5D cMdr7IYbksGXnnVn9mbtiTM06IJRxIU/d6O3c/2yHgv5yJp8JMj4dr746iI4EVGZ osA1FDefsCpIaE8/axToY83uLaroTKjHAqucQoQ/+5htTTcfoEM/MNX7ZcLS7uxl alHUNWH2KCxHiYC3HBL04B+dHdY3K3HaOR57TwDbzHSnjcBwa45jaDGBo9fV/0aZ cpbisJ+5O/IYl4uwUTYpFPrfcy95KxdxaIp/K167uDbc/Nb+rUOY9BjdqGjVyGHt V749gV1tO4jnzJMUF+sIuvhCDME802NOs2yOnMTltKLNDfivouT8PAxAEF4ozFlJ gBUtKfWMb2teQpDp64K4bQAZOUFEjW1KuETIPD9oq7tNx2Ohp9QGl08pKxA66OaD 8GiBqmjA/NzM7xmZqWSMqu6GSrSQnA5PDMZM/B4m79cVYzYoGi7FBLq3hBEKCXKG y3TWNnVjRXVamHh4cWY3i+1fC+se+DobR/dt/l1abtJ/HdnxNcQQc57eB97yAvQI Xg7u0Hhf6uqJkGohoyA7CWpr1ArEszBIfgQ4niCTa5anT5KrrQly9Imkt1i+9pdi SFh0tDFyzyL0Fhcc0VvY =+Nmz -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQf4NJAAoJEO2X6Q5iqn4007sP/R1bciDNZ1CbkCNT4EMVaK8E PLhql3SsNZrPJYZHm5Ph03uG8YvlY1ysHgSQn9dz/MNQ8eO3oBno06To/1Tn34Rh W6J0Iyrw9EOuCykke0oF/EmUh2T89DFJUzKbg+3x5UZ8QM+mhHHCL+5wSEm8aY9m zmleAyhwdh+4kgUvVT6f3IisWY2FCOufQZ7oJx8g1QHuPy1lBI8jLqHbUNWvR0CD PyAvhEUPGRDfWUM7jkPpN8tK4LE4PAM0OH3lXhOct221heQ05AFr5+N8i+B3z2lR K0JCeF2QtDtXnkYTKIUMGfXoA7KXTVkAO3gSjcPTusSF6WByLIhiP7I025x9Aglq BGwy1NxVbdiEv51ibiR9VZs28zqxdTnxKoL6cwkmbWApk6XyG/aCZQXjN+92Mtv0 eXRgIHeWzlOE7/b7SHi06iU9p23qR9AQNRpFwZqZHCK/tnn1kl6zl+WKjrM6ZhOO 1WvN1slat57p790+ekld1TbAEU3pto5QZekOMwOdV/5+w3Q09J83AzfNZEeKZS4F GE/RWo6+nCrFUNBMJkx0uOMwcIWW3lK9FEknrfT/Z27XkDKDRL4j5RdWs+juk2Oq z3fUJMqb0TRgIgWl1RIsvWCiAXI4XAojD2Qx3zYr4smhcV/rEZ4NiPLoh/lLY6j2 tuePXzMqu3pQ16Uc/d9h =8M0s -----END PGP SIGNATURE-----

1 0

Heads up: America/Bahia -- it looks like no DST this Sunday
by Cook, Kelley (R.K.) Oct. 16, 2012

Oct. 16, 2012

According to this release the governor of state of Bahia in Brazil announced on Thursday that due to public pressure, he is reversing the DST policy they implemented last year and will not be going to Summer Time on October 21st, 2012. http://translate.google.com/translate?hl=en&sl=pt&u=http://www.correio24hor…

1 0

Proposal for a modern 'Collapsed' Namespace
by Walter Oct. 15, 2012

Oct. 15, 2012

Hi there, I would like to propose solving the following issues for many users by adding a new file in the TZ database: - The much referenced issue of 1.4 billion+ people on Beijing time being semantically mismatched to their timezone entry, which for lack of meaningful alternative timezone identification strings winds up getting displayed to users. - The lack of a functional entry for the widely used but unofficial Xinjiang or Wulumuqi time of western China. - General accrual of crufty old timezones. - The need for a shared database of decent multilingual timezone names and descriptions. - The problem of how to display a timezone to the user that is detected via zone.tab and GeoIP, or similar methods. Please find attached my proposal, which is born of developer requirements and primarily the consideration for end user experience rather than that of historical correctness in edge cases. Kind regards, Walter Stanish

11 31

[PATCH 1/3] Assume C89.
by Paul Eggert Oct. 12, 2012

Oct. 12, 2012

* Makefile (GCC_DEBUG_FLAGS): Modernize for GCC 4.6.3 x86. * asctime.c (asctime_r, asctime): * date.c (main, dogmt, reset, wildinput, nondigit, oops, display) (timeout, sametm, netsettime): * difftime.c (difftime): * ialloc.c (icatalloc, icpyalloc): * localtime.c (detzcode, detzcode64, differ_by_repeat) (tzload, typesequiv, getzname, getnum, getsecs, getoffset) (getrule, transtime, tzparse, gmtload, tzsetwall, tzset) (localsub, localtime, localtime_r, gmtsub, gmtime, gmtime_r) (offtime, leaps_thru_end_of, timesub, ctime, ctime_r) (increment_overflow, long_increment_overflow) (normalize_overflow, long_normalize_overflow, tmcomp, time2sub) (time2, time1, mktime, timelocal, timegm, timeoff, gtime) (leapcorr, time2posix, posix2time): * scheck.c (scheck): * strftime.c (strftime, _fmt, _conv, _add, _yconv, _loc): * zdump.c (my_localtime, abbrok, usage, main, yeartot) (delta, abbr, dumptime): * zic.c (memcheck, eats, eat, error, warning, main) (dolink, itsdir, rcomp, associate, infile, gethms, inrule) (inzone, inzcont, inzsub, inleap, inlink, rulesub, convert) (convert64, puttzcode, puttzcode64, atcomp, is32, writezone, DO) (doabbr, updateminmax, stringoffset, stringrule, stringzone) (outzone, addtt, addtype, leapadd, yearistype, lowerit, ciequal) (itsabbr, byword, getfields, oadd, tadd, rpytime, newabbr) (mkdirs, eitol): Assume C89 or better. Mostly this consists of using function prototypes. In a few places, prototypes are required for portability to hosts where time_t does not promote to itself and where a preceding prototype does not override a definition. But while we're at it we might as well be consistent: it's safe to assume at-least-C89 these days. * ialloc.c (nonzero, imalloc, icalloc, irealloc, ifree, icfree): Remove; no longer needed now that we assume C89 or better. All callers changed to use malloc, calloc, realloc, free. * localtime.c (getzname, getqzname, leaps_thru_end_of, transtime): * zdump.c (delta, yeartot): * zic.c (eitol): Now pure. * private.h, zdump.c (ATTRIBUTE_PURE): New macro. * private.h (icalloc, imalloc, irealloc, icfree, ifree): Remove decls. * zic.c: Remove no-longer-necessary forward decls. (max_time, min_time): Now const. (setboundaries): Remove. --- Makefile | 16 ++- asctime.c | 7 +- date.c | 66 ++++------ difftime.c | 4 +- ialloc.c | 56 +-------- localtime.c | 201 ++++++++++-------------------- private.h | 11 +- scheck.c | 10 +- strftime.c | 40 ++---- zdump.c | 47 +++---- zic.c | 399 +++++++++++++++++++---------------------------------------- 11 files changed, 283 insertions(+), 574 deletions(-) diff --git a/Makefile b/Makefile index cfcd46d..2b18e31 100644 --- a/Makefile +++ b/Makefile @@ -118,10 +118,18 @@ LDLIBS= # -DZIC_MAX_ABBR_LEN_WO_WARN=3 # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) -GCC_DEBUG_FLAGS = -Dlint -g -O3 -fno-common \ - -Wall -Wcast-qual -Wconversion -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith -Wshadow \ - -Wtraditional # -Wstrict-prototypes -Wwrite-strings +GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ + -Wall -Wextra \ + -Wbad-function-cast -Wcast-align -Wcast-qual \ + -Wformat=2 -Winit-self \ + -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \ + -Wnested-externs \ + -Wno-format-nonliteral -Wno-sign-compare -Wno-sign-conversion \ + -Wno-type-limits \ + -Wno-unused-parameter -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines \ + -Wwrite-strings # # If you want to use System V compatibility code, add # -DUSG_COMPAT diff --git a/asctime.c b/asctime.c index 3d3f6b9..152b0db 100644 --- a/asctime.c +++ b/asctime.c @@ -69,9 +69,7 @@ static char buf_asctime[MAX_ASCTIME_BUF_SIZE]; */ char * -asctime_r(timeptr, buf) -register const struct tm * timeptr; -char * buf; +asctime_r(register const struct tm *timeptr, char *buf) { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" @@ -128,8 +126,7 @@ char * buf; */ char * -asctime(timeptr) -register const struct tm * timeptr; +asctime(register const struct tm *timeptr) { return asctime_r(timeptr, buf_asctime); } diff --git a/date.c b/date.c index 5a2346e..b9578e1 100644 --- a/date.c +++ b/date.c @@ -83,9 +83,7 @@ static void wildinput(const char *, const char *, const char *); int -main(argc, argv) -const int argc; -char * argv[]; +main(const int argc, char *argv[]) { register const char * format; register const char * value; @@ -246,11 +244,11 @@ _("date: error: multiple values in command line\n")); tv.tv_sec = (int) adjust; tv.tv_usec = (int) ((adjust - tv.tv_sec) * 1000000L); - if (adjtime(&tv, (struct timeval *) NULL) != 0) + if (adjtime(&tv, NULL) != 0) oops("adjtime"); #endif /* HAVE_ADJTIME */ #if !HAVE_ADJTIME - reset((time_t) (now + adjust), nflag); + reset(now + adjust, nflag); #endif /* !HAVE_ADJTIME */ /* ** Sun silently ignores everything else; we follow suit. @@ -262,13 +260,13 @@ _("date: error: multiple values in command line\n")); struct timezone tz; if (!dflag || !tflag) - if (gettimeofday((struct timeval *) NULL, &tz) != 0) + if (gettimeofday(NULL, &tz) != 0) oops("gettimeofday"); if (dflag) tz.tz_dsttime = dsttime; if (tflag) tz.tz_minuteswest = minuteswest; - if (settimeofday((struct timeval *) NULL, &tz) != 0) + if (settimeofday(NULL, &tz) != 0) oops("settimeofday"); #endif /* HAVE_SETTIMEOFDAY == 2 */ #if HAVE_SETTIMEOFDAY != 2 @@ -314,7 +312,7 @@ dogmt(void) for (n = 0; environ[n] != NULL; ++n) continue; - fakeenv = (char **) malloc((size_t) (n + 2) * sizeof *fakeenv); + fakeenv = malloc((n + 2) * sizeof *fakeenv); if (fakeenv == NULL) { (void) perror(_("Memory exhausted")); errensure(); @@ -445,9 +443,7 @@ extern int logwtmp(); /*ARGSUSED*/ #endif /* !defined TSP_SETDATE */ static void -reset(newt, nflag) -const time_t newt; -const int nflag; +reset(const time_t newt, const int nflag) { register const char * username; static struct timeval tv; /* static so tv_usec is 0 */ @@ -467,7 +463,7 @@ const int nflag; ** "old" entry is always written, for compatibility. */ logwtmp("|", TIME_NAME, ""); - if (settimeofday(&tv, (struct timezone *) NULL) == 0) { + if (settimeofday(&tv, NULL) == 0) { logwtmp("{", TIME_NAME, ""); /* } */ syslog(LOG_AUTH | LOG_NOTICE, _("date set by %s"), username); @@ -478,10 +474,8 @@ const int nflag; #endif /* !defined OLD_TIME */ static void -wildinput(item, value, reason) -const char * const item; -const char * const value; -const char * const reason; +wildinput(const char *const item, const char *const value, + const char *const reason) { (void) fprintf(stderr, _("date: error: bad command line %s \"%s\", %s\n"), @@ -497,8 +491,7 @@ errensure(void) } static const char * -nondigit(cp) -register const char * cp; +nondigit(register const char *cp) { while (is_digit(*cp)) ++cp; @@ -515,8 +508,7 @@ usage(void) } static void -oops(string) -const char * const string; +oops(const char *const string) { int e = errno; @@ -524,12 +516,11 @@ const char * const string; errno = e; (void) perror(string); errensure(); - display((char *) NULL); + display(NULL); } static void -display(format) -const char * const format; +display(const char *const format) { struct tm tm; time_t now; @@ -553,10 +544,7 @@ extern size_t strftime(); #define INCR 1024 static void -timeout(fp, format, tmp) -FILE * const fp; -const char * const format; -const struct tm * const tmp; +timeout(FILE *const fp, const char *const format, const struct tm *const tmp) { char * cp; size_t result; @@ -565,7 +553,7 @@ const struct tm * const tmp; if (*format == '\0') return; size = INCR; - cp = malloc((size_t) size); + cp = malloc(size); for ( ; ; ) { if (cp == NULL) { (void) fprintf(stderr, @@ -578,16 +566,15 @@ const struct tm * const tmp; if (result != 0 || cp[0] == '\0') break; size += INCR; - cp = realloc(cp, (size_t) size); + cp = realloc(cp, size); } (void) fwrite(cp, 1, result, fp); free(cp); } static int -sametm(atmp, btmp) -register const struct tm * const atmp; -register const struct tm * const btmp; +sametm(register const struct tm *const atmp, + register const struct tm *const btmp) { return atmp->tm_year == btmp->tm_year && atmp->tm_mon == btmp->tm_mon && @@ -813,8 +800,7 @@ iffy(const time_t thist, const time_t thatt, * notifies the master that a correction is needed. * Returns 1 on success, 0 on failure. */ -netsettime(ntv) - struct timeval ntv; +netsettime(struct timeval ntv) { int s, length, port, timed_ack, found, err; long waittime; @@ -833,7 +819,7 @@ netsettime(ntv) } dest.sin_port = sp->s_port; dest.sin_family = AF_INET; - dest.sin_addr.s_addr = htonl((u_long)INADDR_ANY); + dest.sin_addr.s_addr = htonl(INADDR_ANY); s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) { if (errno != EPROTONOSUPPORT) @@ -843,7 +829,7 @@ netsettime(ntv) bzero((char *)&sin, sizeof (sin)); sin.sin_family = AF_INET; for (port = IPPORT_RESERVED - 1; port > IPPORT_RESERVED / 2; port--) { - sin.sin_port = htons((u_short)port); + sin.sin_port = htons(port); if (bind(s, (struct sockaddr *)&sin, sizeof (sin)) >= 0) break; if (errno != EADDRINUSE) { @@ -863,9 +849,9 @@ netsettime(ntv) goto bad; } (void) strncpy(msg.tsp_name, hostname, sizeof (hostname)); - msg.tsp_seq = htons((u_short)0); - msg.tsp_time.tv_sec = htonl((u_long)ntv.tv_sec); - msg.tsp_time.tv_usec = htonl((u_long)ntv.tv_usec); + msg.tsp_seq = htons(0); + msg.tsp_time.tv_sec = htonl(ntv.tv_sec); + msg.tsp_time.tv_usec = htonl(ntv.tv_usec); length = sizeof (struct sockaddr_in); if (connect(s, &dest, length) < 0) { perror("date: connect"); @@ -883,7 +869,7 @@ loop: tout.tv_usec = 0; FD_ZERO(&ready); FD_SET(s, &ready); - found = select(FD_SETSIZE, &ready, (fd_set *)0, (fd_set *)0, &tout); + found = select(FD_SETSIZE, &ready, 0, 0, &tout); length = sizeof err; if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char *)&err, &length) == 0 && err) { diff --git a/difftime.c b/difftime.c index 59e3351..c8c85b3 100644 --- a/difftime.c +++ b/difftime.c @@ -8,9 +8,7 @@ #include "private.h" /* for time_t, TYPE_INTEGRAL, and TYPE_SIGNED */ double -difftime(time1, time0) -const time_t time1; -const time_t time0; +difftime(const time_t time1, const time_t time0) { /* ** If (sizeof (double) > sizeof (time_t)) simply convert and subtract diff --git a/ialloc.c b/ialloc.c index 0268cf4..b6f0188 100644 --- a/ialloc.c +++ b/ialloc.c @@ -7,39 +7,8 @@ #include "private.h" -#define nonzero(n) (((n) == 0) ? 1 : (n)) - -char * -imalloc(n) -const int n; -{ - return malloc((size_t) nonzero(n)); -} - -char * -icalloc(nelem, elsize) -int nelem; -int elsize; -{ - if (nelem == 0 || elsize == 0) - nelem = elsize = 1; - return calloc((size_t) nelem, (size_t) elsize); -} - -void * -irealloc(pointer, size) -void * const pointer; -const int size; -{ - if (pointer == NULL) - return imalloc(size); - return realloc((void *) pointer, (size_t) nonzero(size)); -} - char * -icatalloc(old, new) -char * const old; -const char * const new; +icatalloc(char *const old, const char *const new) { register char * result; register int oldsize, newsize; @@ -50,31 +19,14 @@ const char * const new; else if (newsize == 0) return old; else oldsize = strlen(old); - if ((result = irealloc(old, oldsize + newsize + 1)) != NULL) + if ((result = realloc(old, oldsize + newsize + 1)) != NULL) if (new != NULL) (void) strcpy(result + oldsize, new); return result; } char * -icpyalloc(string) -const char * const string; -{ - return icatalloc((char *) NULL, string); -} - -void -ifree(p) -char * const p; -{ - if (p != NULL) - (void) free(p); -} - -void -icfree(p) -char * const p; +icpyalloc(const char *const string) { - if (p != NULL) - (void) free(p); + return icatalloc(NULL, string); } diff --git a/localtime.c b/localtime.c index 93ef8a8..e074c54 100644 --- a/localtime.c +++ b/localtime.c @@ -133,8 +133,9 @@ struct rule { static long detzcode(const char * codep); static time_t detzcode64(const char * codep); static int differ_by_repeat(time_t t1, time_t t0); -static const char * getzname(const char * strp); -static const char * getqzname(const char * strp, const int delim); +static const char * getzname(const char * strp) ATTRIBUTE_PURE; +static const char * getqzname(const char * strp, const int delim) + ATTRIBUTE_PURE; static const char * getnum(const char * strp, int * nump, int min, int max); static const char * getsecs(const char * strp, long * secsp); @@ -146,7 +147,7 @@ static struct tm * gmtsub(const time_t * timep, long offset, static struct tm * localsub(const time_t * timep, long offset, struct tm * tmp); static int increment_overflow(int * number, int delta); -static int leaps_thru_end_of(int y); +static int leaps_thru_end_of(int y) ATTRIBUTE_PURE; static int long_increment_overflow(long * number, int delta); static int long_normalize_overflow(long * tensptr, int * unitsptr, int base); @@ -170,7 +171,8 @@ static struct tm * timesub(const time_t * timep, long offset, static int tmcomp(const struct tm * atmp, const struct tm * btmp); static time_t transtime(time_t janfirst, int year, - const struct rule * rulep, long offset); + const struct rule * rulep, long offset) + ATTRIBUTE_PURE; static int typesequiv(const struct state * sp, int a, int b); static int tzload(const char * name, struct state * sp, int doextend); @@ -222,8 +224,7 @@ time_t altzone = 0; #endif /* defined ALTZONE */ static long -detzcode(codep) -const char * const codep; +detzcode(const char *const codep) { register long result; register int i; @@ -235,8 +236,7 @@ const char * const codep; } static time_t -detzcode64(codep) -const char * const codep; +detzcode64(const char *const codep) { register time_t result; register int i; @@ -310,9 +310,7 @@ settzname(void) } static int -differ_by_repeat(t1, t0) -const time_t t1; -const time_t t0; +differ_by_repeat(const time_t t1, const time_t t0) { if (TYPE_INTEGRAL(time_t) && TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS) @@ -321,10 +319,8 @@ const time_t t0; } static int -tzload(name, sp, doextend) -register const char * name; -register struct state * const sp; -register const int doextend; +tzload(register const char *name, register struct state *const sp, + register const int doextend) { register const char * p; register int i; @@ -571,21 +567,18 @@ register const int doextend; } } #ifdef ALL_STATE - (void) free((void *) up); + free(up); #endif /* defined ALL_STATE */ return 0; oops: #ifdef ALL_STATE - (void) free((void *) up); + free(up); #endif /* defined ALL_STATE */ return -1; } static int -typesequiv(sp, a, b) -const struct state * const sp; -const int a; -const int b; +typesequiv(const struct state *const sp, const int a, const int b) { register int result; @@ -622,8 +615,7 @@ static const int year_lengths[2] = { */ static const char * -getzname(strp) -register const char * strp; +getzname(register const char *strp) { register char c; @@ -660,11 +652,7 @@ getqzname(register const char *strp, const int delim) */ static const char * -getnum(strp, nump, min, max) -register const char * strp; -int * const nump; -const int min; -const int max; +getnum(register const char *strp, int *const nump, const int min, const int max) { register char c; register int num; @@ -693,9 +681,7 @@ const int max; */ static const char * -getsecs(strp, secsp) -register const char * strp; -long * const secsp; +getsecs(register const char *strp, long *const secsp) { int num; @@ -735,9 +721,7 @@ long * const secsp; */ static const char * -getoffset(strp, offsetp) -register const char * strp; -long * const offsetp; +getoffset(register const char *strp, long *const offsetp) { register int neg = 0; @@ -762,9 +746,7 @@ long * const offsetp; */ static const char * -getrule(strp, rulep) -const char * strp; -register struct rule * const rulep; +getrule(const char *strp, register struct rule *const rulep) { if (*strp == 'J') { /* @@ -816,11 +798,8 @@ register struct rule * const rulep; */ static time_t -transtime(janfirst, year, rulep, offset) -const time_t janfirst; -const int year; -register const struct rule * const rulep; -const long offset; +transtime(const time_t janfirst, const int year, + register const struct rule *const rulep, const long offset) { register int leapyear; register time_t value; @@ -911,10 +890,8 @@ const long offset; */ static int -tzparse(name, sp, lastditch) -const char * name; -register struct state * const sp; -const int lastditch; +tzparse(const char *name, register struct state *const sp, + const int lastditch) { const char * stdname; const char * dstname; @@ -1149,8 +1126,7 @@ const int lastditch; } static void -gmtload(sp) -struct state * const sp; +gmtload(struct state *const sp) { if (tzload(gmt, sp, TRUE) != 0) (void) tzparse(gmt, sp, TRUE); @@ -1172,14 +1148,14 @@ tzsetwall(void) #ifdef ALL_STATE if (lclptr == NULL) { - lclptr = (struct state *) calloc(1, sizeof *lclptr); + lclptr = calloc(1, sizeof *lclptr); if (lclptr == NULL) { settzname(); /* all we can do */ return; } } #endif /* defined ALL_STATE */ - if (tzload((char *) NULL, lclptr, TRUE) != 0) + if (tzload(NULL, lclptr, TRUE) != 0) gmtload(lclptr); settzname(); } @@ -1203,7 +1179,7 @@ tzset(void) #ifdef ALL_STATE if (lclptr == NULL) { - lclptr = (struct state *) calloc(1, sizeof *lclptr); + lclptr = calloc(1, sizeof *lclptr); if (lclptr == NULL) { settzname(); /* all we can do */ return; @@ -1238,10 +1214,7 @@ tzset(void) /*ARGSUSED*/ static struct tm * -localsub(timep, offset, tmp) -const time_t * const timep; -const long offset; -struct tm * const tmp; +localsub(const time_t *const timep, const long offset, struct tm *const tmp) { register struct state * sp; register const struct ttinfo * ttisp; @@ -1330,8 +1303,7 @@ struct tm * const tmp; } struct tm * -localtime(timep) -const time_t * const timep; +localtime(const time_t *const timep) { tzset(); return localsub(timep, 0L, &tm); @@ -1342,9 +1314,7 @@ const time_t * const timep; */ struct tm * -localtime_r(timep, tmp) -const time_t * const timep; -struct tm * tmp; +localtime_r(const time_t *const timep, struct tm *tmp) { return localsub(timep, 0L, tmp); } @@ -1354,17 +1324,14 @@ struct tm * tmp; */ static struct tm * -gmtsub(timep, offset, tmp) -const time_t * const timep; -const long offset; -struct tm * const tmp; +gmtsub(const time_t *const timep, const long offset, struct tm *const tmp) { register struct tm * result; if (!gmt_is_set) { gmt_is_set = TRUE; #ifdef ALL_STATE - gmtptr = (struct state *) calloc(1, sizeof *gmtptr); + gmtptr = calloc(1, sizeof *gmtptr); if (gmtptr != NULL) #endif /* defined ALL_STATE */ gmtload(gmtptr); @@ -1393,8 +1360,7 @@ struct tm * const tmp; } struct tm * -gmtime(timep) -const time_t * const timep; +gmtime(const time_t *const timep) { return gmtsub(timep, 0L, &tm); } @@ -1404,9 +1370,7 @@ const time_t * const timep; */ struct tm * -gmtime_r(timep, tmp) -const time_t * const timep; -struct tm * tmp; +gmtime_r(const time_t *const timep, struct tm *tmp) { return gmtsub(timep, 0L, tmp); } @@ -1414,9 +1378,7 @@ struct tm * tmp; #ifdef STD_INSPIRED struct tm * -offtime(timep, offset) -const time_t * const timep; -const long offset; +offtime(const time_t *const timep, const long offset) { return gmtsub(timep, offset, &tm); } @@ -1429,19 +1391,16 @@ const long offset; */ static int -leaps_thru_end_of(y) -register const int y; +leaps_thru_end_of(register const int y) { return (y >= 0) ? (y / 4 - y / 100 + y / 400) : -(leaps_thru_end_of(-(y + 1)) + 1); } static struct tm * -timesub(timep, offset, sp, tmp) -const time_t * const timep; -const long offset; -register const struct state * const sp; -register struct tm * const tmp; +timesub(const time_t *const timep, const long offset, + register const struct state *const sp, + register struct tm *const tmp) { register const struct lsinfo * lp; register time_t tdays; @@ -1571,8 +1530,7 @@ register struct tm * const tmp; } char * -ctime(timep) -const time_t * const timep; +ctime(const time_t *const timep) { /* ** Section 4.12.3.2 of X3.159-1989 requires that @@ -1584,9 +1542,7 @@ const time_t * const timep; } char * -ctime_r(timep, buf) -const time_t * const timep; -char * buf; +ctime_r(const time_t *const timep, char *buf) { struct tm mytm; @@ -1611,9 +1567,7 @@ char * buf; */ static int -increment_overflow(ip, j) -int * const ip; -int j; +increment_overflow(int *const ip, int j) { register int const i = *ip; @@ -1630,9 +1584,7 @@ int j; } static int -long_increment_overflow(lp, m) -long * const lp; -int const m; +long_increment_overflow(long *const lp, int const m) { register long const l = *lp; @@ -1643,10 +1595,7 @@ int const m; } static int -normalize_overflow(tensptr, unitsptr, base) -int * const tensptr; -int * const unitsptr; -const int base; +normalize_overflow(int *const tensptr, int *const unitsptr, const int base) { register int tensdelta; @@ -1658,10 +1607,7 @@ const int base; } static int -long_normalize_overflow(tensptr, unitsptr, base) -long * const tensptr; -int * const unitsptr; -const int base; +long_normalize_overflow(long *const tensptr, int *const unitsptr, const int base) { register int tensdelta; @@ -1673,9 +1619,8 @@ const int base; } static int -tmcomp(atmp, btmp) -register const struct tm * const atmp; -register const struct tm * const btmp; +tmcomp(register const struct tm *const atmp, + register const struct tm *const btmp) { register int result; @@ -1689,12 +1634,11 @@ register const struct tm * const btmp; } static time_t -time2sub(tmp, funcp, offset, okayp, do_norm_secs) -struct tm * const tmp; -struct tm * (* const funcp)(const time_t*, long, struct tm*); -const long offset; -int * const okayp; -const int do_norm_secs; +time2sub(struct tm *const tmp, + struct tm *(*const funcp)(const time_t *, long, struct tm *), + const long offset, + int *const okayp, + const int do_norm_secs) { register const struct state * sp; register int dir; @@ -1873,11 +1817,10 @@ label: } static time_t -time2(tmp, funcp, offset, okayp) -struct tm * const tmp; -struct tm * (* const funcp)(const time_t*, long, struct tm*); -const long offset; -int * const okayp; +time2(struct tm * const tmp, + struct tm * (*const funcp)(const time_t *, long, struct tm *), + const long offset, + int *const okayp) { time_t t; @@ -1891,10 +1834,9 @@ int * const okayp; } static time_t -time1(tmp, funcp, offset) -struct tm * const tmp; -struct tm * (* const funcp)(const time_t *, long, struct tm *); -const long offset; +time1(struct tm *const tmp, + struct tm *(*const funcp) (const time_t *, long, struct tm *), + const long offset) { register time_t t; register const struct state * sp; @@ -1968,8 +1910,7 @@ const long offset; } time_t -mktime(tmp) -struct tm * const tmp; +mktime(struct tm *const tmp) { tzset(); return time1(tmp, localsub, 0L); @@ -1978,8 +1919,7 @@ struct tm * const tmp; #ifdef STD_INSPIRED time_t -timelocal(tmp) -struct tm * const tmp; +timelocal(struct tm *const tmp) { if (tmp != NULL) tmp->tm_isdst = -1; /* in case it wasn't initialized */ @@ -1987,8 +1927,7 @@ struct tm * const tmp; } time_t -timegm(tmp) -struct tm * const tmp; +timegm(struct tm *const tmp) { if (tmp != NULL) tmp->tm_isdst = 0; @@ -1996,9 +1935,7 @@ struct tm * const tmp; } time_t -timeoff(tmp, offset) -struct tm * const tmp; -const long offset; +timeoff(struct tm *const tmp, const long offset) { if (tmp != NULL) tmp->tm_isdst = 0; @@ -2015,8 +1952,7 @@ const long offset; */ long -gtime(tmp) -struct tm * const tmp; +gtime(struct tm *const tmp) { const time_t t = mktime(tmp); @@ -2042,8 +1978,7 @@ struct tm * const tmp; */ static long -leapcorr(timep) -time_t * timep; +leapcorr(time_t *timep) { register struct state * sp; register struct lsinfo * lp; @@ -2060,16 +1995,14 @@ time_t * timep; } time_t -time2posix(t) -time_t t; +time2posix(time_t t) { tzset(); return t - leapcorr(&t); } time_t -posix2time(t) -time_t t; +posix2time(time_t t) { time_t x; time_t y; diff --git a/private.h b/private.h index f0e2e6d..1d1d391 100644 --- a/private.h +++ b/private.h @@ -144,6 +144,12 @@ typedef long int_fast64_t; #define INT32_MIN (-1 - INT32_MAX) #endif /* !defined INT32_MIN */ +#if 2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__) +# define ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define ATTRIBUTE_PURE /* empty */ +#endif + /* ** Workarounds for compilers/systems. */ @@ -162,13 +168,8 @@ extern char * asctime_r(struct tm const *, char *); ** Private function declarations. */ -char * icalloc(int nelem, int elsize); char * icatalloc(char * old, const char * new); char * icpyalloc(const char * string); -char * imalloc(int n); -void * irealloc(void * pointer, int size); -void icfree(char * pointer); -void ifree(char * pointer); const char * scheck(const char * string, const char * format); /* diff --git a/scheck.c b/scheck.c index 8e7737f..ed60980 100644 --- a/scheck.c +++ b/scheck.c @@ -8,9 +8,7 @@ #include "private.h" const char * -scheck(string, format) -const char * const string; -const char * const format; +scheck(const char *const string, const char *const format) { register char * fbuf; register const char * fp; @@ -22,7 +20,7 @@ const char * const format; result = ""; if (string == NULL || format == NULL) return result; - fbuf = imalloc((int) (2 * strlen(format) + 4)); + fbuf = malloc(2 * strlen(format) + 4); if (fbuf == NULL) return result; fp = format; @@ -51,7 +49,7 @@ const char * const format; *tp++ = 'c'; *tp = '\0'; if (sscanf(string, fbuf, &dummy) != 1) - result = (char *) format; - ifree(fbuf); + result = format; + free(fbuf); return result; } diff --git a/strftime.c b/strftime.c index e8c8b82..4950f74 100644 --- a/strftime.c +++ b/strftime.c @@ -114,11 +114,8 @@ extern char * tzname[]; #define IN_ALL 3 size_t -strftime(s, maxsize, format, t) -char * const s; -const size_t maxsize; -const char * const format; -const struct tm * const t; +strftime(char * const s, const size_t maxsize, const char *const format, + const struct tm *const t) { char * p; int warn; @@ -152,12 +149,8 @@ const struct tm * const t; } static char * -_fmt(format, t, pt, ptlim, warnp) -const char * format; -const struct tm * const t; -char * pt; -const char * const ptlim; -int * warnp; +_fmt(const char *format, const struct tm *const t, char * pt, + const char *const ptlim, int *warnp) { for ( ; *format; ++format) { if (*format == '%') { @@ -565,11 +558,8 @@ label: } static char * -_conv(n, format, pt, ptlim) -const int n; -const char * const format; -char * const pt; -const char * const ptlim; +_conv(const int n, const char *const format, char *const pt, + const char *const ptlim) { char buf[INT_STRLEN_MAXIMUM(int) + 1]; @@ -578,10 +568,7 @@ const char * const ptlim; } static char * -_add(str, pt, ptlim) -const char * str; -char * pt; -const char * const ptlim; +_add(const char *str, char *pt, const char *const ptlim) { while (pt < ptlim && (*pt = *str++) != '\0') ++pt; @@ -597,13 +584,8 @@ const char * const ptlim; */ static char * -_yconv(a, b, convert_top, convert_yy, pt, ptlim) -const int a; -const int b; -const int convert_top; -const int convert_yy; -char * pt; -const char * const ptlim; +_yconv(const int a, const int b, const int convert_top, const int convert_yy, + char *pt, const char *const ptlim) { register int lead; register int trail; @@ -654,7 +636,7 @@ _loc(void) */ if (localebuf.mon[0]) return &localebuf; - name = setlocale(LC_TIME, (char *) NULL); + name = setlocale(LC_TIME, NULL); if (name == NULL || *name == '\0') goto no_locale; /* @@ -702,7 +684,7 @@ _loc(void) (void) strcpy(lbuf, name); p = lbuf + namesize; plim = p + st.st_size; - if (read(fd, p, (size_t) st.st_size) != st.st_size) + if (read(fd, p, st.st_size) != st.st_size) goto bad_lbuf; if (close(fd) != 0) goto bad_lbuf; diff --git a/zdump.c b/zdump.c index 7b96a4f..6caa7a2 100644 --- a/zdump.c +++ b/zdump.c @@ -119,6 +119,12 @@ #endif /* !defined GNUC_or_lint */ #endif /* !defined INITIALIZE */ +#if 2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__) +# define ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define ATTRIBUTE_PURE /* empty */ +#endif + /* ** For the benefit of GNU folk... ** `_(MSGID)' uses the current locale's message library string for MSGID. @@ -152,20 +158,19 @@ static int warned; static char * abbr(struct tm * tmp); static void abbrok(const char * abbrp, const char * zone); -static long delta(struct tm * newp, struct tm * oldp); +static long delta(struct tm * newp, struct tm * oldp) ATTRIBUTE_PURE; static void dumptime(const struct tm * tmp); static time_t hunt(char * name, time_t lot, time_t hit); static void setabsolutes(void); static void show(char * zone, time_t t, int v); static const char * tformat(void); -static time_t yeartot(long y); +static time_t yeartot(long y) ATTRIBUTE_PURE; #ifndef TYPECHECK #define my_localtime localtime #else /* !defined TYPECHECK */ static struct tm * -my_localtime(tp) -time_t * tp; +my_localtime(time_t *tp) { register struct tm * tmp; @@ -198,12 +203,10 @@ time_t * tp; #endif /* !defined TYPECHECK */ static void -abbrok(abbrp, zone) -const char * const abbrp; -const char * const zone; +abbrok(const char *const abbrp, const char *const zone) { register const char * cp; - register char * wp; + register const char * wp; if (warned) return; @@ -236,9 +239,7 @@ const char * const zone; } static void -usage(stream, status) -FILE * const stream; -const int status; +usage(FILE * const stream, const int status) { (void) fprintf(stream, _("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\ @@ -249,9 +250,7 @@ Report bugs to tz(a)elsie.nci.nih.gov.\n"), } int -main(argc, argv) -int argc; -char * argv[]; +main(int argc, char *argv[]) { register int i; register int c; @@ -330,10 +329,9 @@ char * argv[]; for (i = 0; environ[i] != NULL; ++i) continue; - fakeenv = (char **) malloc((size_t) ((i + 2) * - sizeof *fakeenv)); - if (fakeenv == NULL || - (fakeenv[0] = (char *) malloc(longest + 4)) == NULL) { + fakeenv = malloc((i + 2) * sizeof *fakeenv); + if (fakeenv == NULL + || (fakeenv[0] = malloc(longest + 4)) == NULL) { (void) perror(progname); exit(EXIT_FAILURE); } @@ -451,8 +449,7 @@ _("%s: use of -v on system with floating time_t other than float or double\n"), } static time_t -yeartot(y) -const long y; +yeartot(const long y) { register long myy; register long seconds; @@ -530,9 +527,7 @@ hunt(char *name, time_t lot, time_t hit) */ static long -delta(newp, oldp) -struct tm * newp; -struct tm * oldp; +delta(struct tm * newp, struct tm *oldp) { register long result; register int tmy; @@ -586,8 +581,7 @@ show(char *zone, time_t t, int v) } static char * -abbr(tmp) -struct tm * tmp; +abbr(struct tm *tmp) { register char * result; static char nada; @@ -626,8 +620,7 @@ tformat(void) } static void -dumptime(timeptr) -register const struct tm * timeptr; +dumptime(register const struct tm *timeptr) { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" diff --git a/zic.c b/zic.c index 4ae31a2..64af1b2 100644 --- a/zic.c +++ b/zic.c @@ -110,17 +110,8 @@ static int addtype(long gmtoff, const char * abbr, int isdst, static void leapadd(zic_t t, int positive, int rolling, int count); static void adjleap(void); static void associate(void); -static int ciequal(const char * ap, const char * bp); -static void convert(long val, char * buf); -static void convert64(zic_t val, char * buf); static void dolink(const char * fromfield, const char * tofield); -static void doabbr(char * abbr, const char * format, - const char * letters, int isdst, int doquotes); -static void eat(const char * name, int num); -static void eats(const char * name, int num, - const char * rname, int rnum); static long eitol(int i); -static void error(const char * message); static char ** getfields(char * buf); static long gethms(const char * string, const char * errstrng, int signable); @@ -131,32 +122,18 @@ static void inrule(char ** fields, int nfields); static int inzcont(char ** fields, int nfields); static int inzone(char ** fields, int nfields); static int inzsub(char ** fields, int nfields, int iscont); -static int is32(zic_t x); -static int itsabbr(const char * abbr, const char * word); static int itsdir(const char * name); static int lowerit(int c); -static char * memcheck(char * tocheck); static int mkdirs(char * filename); static void newabbr(const char * abbr); static long oadd(long t1, long t2); static void outzone(const struct zone * zp, int ntzones); -static void puttzcode(long code, FILE * fp); -static void puttzcode64(zic_t code, FILE * fp); -static int rcomp(const void * leftp, const void * rightp); static zic_t rpytime(const struct rule * rp, int wantedy); static void rulesub(struct rule * rp, const char * loyearp, const char * hiyearp, const char * typep, const char * monthp, const char * dayp, const char * timep); -static int stringoffset(char * result, long offset); -static int stringrule(char * result, const struct rule * rp, - long dstoff, long gmtoff); -static void stringzone(char * result, - const struct zone * zp, int ntzones); -static void setboundaries(void); static zic_t tadd(zic_t t1, long t2); -static void usage(FILE *stream, int status); -static void writezone(const char * name, const char * string); static int yearistype(int year, const char * type); static int charcnt; @@ -169,9 +146,7 @@ static int leapmaxyear; static int linenum; static int max_abbrvar_len; static int max_format_len; -static zic_t max_time; static int max_year; -static zic_t min_time; static int min_year; static int noise; static const char * rfilename; @@ -377,9 +352,8 @@ static char roll[TZ_MAX_LEAPS]; ** Memory allocation. */ -static char * -memcheck(ptr) -char * const ptr; +static ATTRIBUTE_PURE void * +memcheck(void *const ptr) { if (ptr == NULL) { const char *e = strerror(errno); @@ -391,8 +365,8 @@ char * const ptr; return ptr; } -#define emalloc(size) memcheck(imalloc(size)) -#define erealloc(ptr, size) memcheck(irealloc((ptr), (size))) +#define emalloc(size) memcheck(malloc(size)) +#define erealloc(ptr, size) memcheck(realloc(ptr, size)) #define ecpyalloc(ptr) memcheck(icpyalloc(ptr)) #define ecatalloc(oldp, newp) memcheck(icatalloc((oldp), (newp))) @@ -401,11 +375,8 @@ char * const ptr; */ static void -eats(name, num, rname, rnum) -const char * const name; -const int num; -const char * const rname; -const int rnum; +eats(const char *const name, const int num, const char *const rname, + const int rnum) { filename = name; linenum = num; @@ -414,16 +385,13 @@ const int rnum; } static void -eat(name, num) -const char * const name; -const int num; +eat(const char *const name, const int num) { - eats(name, num, (char *) NULL, -1); + eats(name, num, NULL, -1); } static void -error(string) -const char * const string; +error(const char *const string) { /* ** Match the format of "cc" to allow sh users to @@ -440,15 +408,14 @@ const char * const string; } static void -warning(string) -const char * const string; +warning(const char *const string) { char * cp; cp = ecpyalloc(_("warning: ")); cp = ecatalloc(cp, string); error(cp); - ifree(cp); + free(cp); --errors; } @@ -471,9 +438,7 @@ static const char * leapsec; static const char * yitcommand; int -main(argc, argv) -int argc; -char * argv[]; +main(int argc, char **argv) { register int i; register int j; @@ -570,8 +535,6 @@ _("%s: More than one -L option specified\n"), if (yitcommand == NULL) yitcommand = "yearistype"; - setboundaries(); - if (optind < argc && leapsec != NULL) { infile(leapsec); adjleap(); @@ -614,9 +577,7 @@ _("%s: More than one -L option specified\n"), } static void -dolink(fromfield, tofield) -const char * const fromfield; -const char * const tofield; +dolink(const char *const fromfield, const char *const tofield) { register char * fromname; register char * toname; @@ -666,7 +627,7 @@ const char * const tofield; toname); if (result == 0) warning(_("hard link failed, symbolic link used")); - ifree(symlinkcontents); + free(symlinkcontents); } #endif /* HAVE_SYMLINK */ if (result != 0) { @@ -678,26 +639,17 @@ warning(_("hard link failed, symbolic link used")); exit(EXIT_FAILURE); } } - ifree(fromname); - ifree(toname); + free(fromname); + free(toname); } #define TIME_T_BITS_IN_FILE 64 -static void -setboundaries(void) -{ - register int i; - - min_time = -1; - for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i) - min_time *= 2; - max_time = -(min_time + 1); -} +static const zic_t min_time = (zic_t) -1 << (TIME_T_BITS_IN_FILE - 1); +static const zic_t max_time = -1 - ((zic_t) -1 << (TIME_T_BITS_IN_FILE - 1)); static int -itsdir(name) -const char * const name; +itsdir(const char *const name) { register char * myname; register int accres; @@ -705,7 +657,7 @@ const char * const name; myname = ecpyalloc(name); myname = ecatalloc(myname, "/."); accres = access(myname, F_OK); - ifree(myname); + free(myname); return accres == 0; } @@ -718,9 +670,7 @@ const char * const name; */ static int -rcomp(cp1, cp2) -const void * cp1; -const void * cp2; +rcomp(const void *cp1, const void *cp2) { return strcmp(((const struct rule *) cp1)->r_name, ((const struct rule *) cp2)->r_name); @@ -735,8 +685,7 @@ associate(void) register int i, j; if (nrules != 0) { - (void) qsort((void *) rules, (size_t) nrules, - (size_t) sizeof *rules, rcomp); + (void) qsort(rules, nrules, sizeof *rules, rcomp); for (i = 0; i < nrules - 1; ++i) { if (strcmp(rules[i].r_name, rules[i + 1].r_name) != 0) @@ -803,8 +752,7 @@ associate(void) } static void -infile(name) -const char * name; +infile(const char *name) { register FILE * fp; register char ** fields; @@ -828,7 +776,7 @@ const char * name; wantcont = FALSE; for (num = 1; ; ++num) { eat(name, num); - if (fgets(buf, (int) sizeof buf, fp) != buf) + if (fgets(buf, sizeof buf, fp) != buf) break; cp = strchr(buf, '\n'); if (cp == NULL) { @@ -880,7 +828,7 @@ _("%s: panic: Invalid l_value %d\n"), exit(EXIT_FAILURE); } } - ifree((char *) fields); + free(fields); } if (ferror(fp)) { (void) fprintf(stderr, _("%s: Error reading %s\n"), @@ -907,10 +855,7 @@ _("%s: panic: Invalid l_value %d\n"), */ static long -gethms(string, errstring, signable) -const char * string; -const char * const errstring; -const int signable; +gethms(const char *string, const char *const errstring, const int signable) { long hh; int mm, ss, sign; @@ -952,9 +897,7 @@ warning(_("values over 24 hours not handled by pre-2007 versions of zic")); } static void -inrule(fields, nfields) -register char ** const fields; -const int nfields; +inrule(register char **const fields, const int nfields) { static struct rule r; @@ -975,15 +918,12 @@ const int nfields; r.r_abbrvar = ecpyalloc(fields[RF_ABBRVAR]); if (max_abbrvar_len < strlen(r.r_abbrvar)) max_abbrvar_len = strlen(r.r_abbrvar); - rules = (struct rule *) (void *) erealloc((char *) rules, - (int) ((nrules + 1) * sizeof *rules)); + rules = erealloc(rules, (nrules + 1) * sizeof *rules); rules[nrules++] = r; } static int -inzone(fields, nfields) -register char ** const fields; -const int nfields; +inzone(register char **const fields, const int nfields) { register int i; static char * buf; @@ -993,7 +933,7 @@ const int nfields; return FALSE; } if (strcmp(fields[ZF_NAME], TZDEFAULT) == 0 && lcltime != NULL) { - buf = erealloc(buf, (int) (132 + strlen(TZDEFAULT))); + buf = erealloc(buf, 132 + strlen(TZDEFAULT)); (void) sprintf(buf, _("\"Zone %s\" line and -l option are mutually exclusive"), TZDEFAULT); @@ -1001,7 +941,7 @@ _("\"Zone %s\" line and -l option are mutually exclusive"), return FALSE; } if (strcmp(fields[ZF_NAME], TZDEFRULES) == 0 && psxrules != NULL) { - buf = erealloc(buf, (int) (132 + strlen(TZDEFRULES))); + buf = erealloc(buf, 132 + strlen(TZDEFRULES)); (void) sprintf(buf, _("\"Zone %s\" line and -p option are mutually exclusive"), TZDEFRULES); @@ -1011,9 +951,9 @@ _("\"Zone %s\" line and -p option are mutually exclusive"), for (i = 0; i < nzones; ++i) if (zones[i].z_name != NULL && strcmp(zones[i].z_name, fields[ZF_NAME]) == 0) { - buf = erealloc(buf, (int) (132 + - strlen(fields[ZF_NAME]) + - strlen(zones[i].z_filename))); + buf = erealloc(buf, + (132 + strlen(fields[ZF_NAME]) + + strlen(zones[i].z_filename))); (void) sprintf(buf, _("duplicate zone name %s (file \"%s\", line %d)"), fields[ZF_NAME], @@ -1026,9 +966,7 @@ _("duplicate zone name %s (file \"%s\", line %d)"), } static int -inzcont(fields, nfields) -register char ** const fields; -const int nfields; +inzcont(register char **const fields, const int nfields) { if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS) { error(_("wrong number of fields on Zone continuation line")); @@ -1038,10 +976,7 @@ const int nfields; } static int -inzsub(fields, nfields, iscont) -register char ** const fields; -const int nfields; -const int iscont; +inzsub(register char **const fields, const int nfields, const int iscont) { register char * cp; static struct zone z; @@ -1108,8 +1043,7 @@ const int iscont; return FALSE; } } - zones = (struct zone *) (void *) erealloc((char *) zones, - (int) ((nzones + 1) * sizeof *zones)); + zones = erealloc(zones, (nzones + 1) * sizeof *zones); zones[nzones++] = z; /* ** If there was an UNTIL field on this line, @@ -1119,9 +1053,7 @@ const int iscont; } static void -inleap(fields, nfields) -register char ** const fields; -const int nfields; +inleap(register char ** const fields, const int nfields) { register const char * cp; register const struct lookup * lp; @@ -1223,9 +1155,7 @@ const int nfields; } static void -inlink(fields, nfields) -register char ** const fields; -const int nfields; +inlink(register char **const fields, const int nfields) { struct link l; @@ -1245,20 +1175,18 @@ const int nfields; l.l_linenum = linenum; l.l_from = ecpyalloc(fields[LF_FROM]); l.l_to = ecpyalloc(fields[LF_TO]); - links = (struct link *) (void *) erealloc((char *) links, - (int) ((nlinks + 1) * sizeof *links)); + links = erealloc(links, (nlinks + 1) * sizeof *links); links[nlinks++] = l; } static void -rulesub(rp, loyearp, hiyearp, typep, monthp, dayp, timep) -register struct rule * const rp; -const char * const loyearp; -const char * const hiyearp; -const char * const typep; -const char * const monthp; -const char * const dayp; -const char * const timep; +rulesub(register struct rule *const rp, + const char *const loyearp, + const char *const hiyearp, + const char *const typep, + const char *const monthp, + const char *const dayp, + const char *const timep) { register const struct lookup * lp; register const char * cp; @@ -1296,7 +1224,7 @@ const char * const timep; } } rp->r_tod = gethms(dp, _("invalid time of day"), FALSE); - ifree(dp); + free(dp); /* ** Year work. */ @@ -1380,12 +1308,12 @@ const char * const timep; *ep++ = 0; if (*ep++ != '=') { error(_("invalid day of month")); - ifree(dp); + free(dp); return; } if ((lp = byword(dp, wday_names)) == NULL) { error(_("invalid weekday name")); - ifree(dp); + free(dp); return; } rp->r_wday = lp->l_value; @@ -1394,63 +1322,55 @@ const char * const timep; rp->r_dayofmonth <= 0 || (rp->r_dayofmonth > len_months[1][rp->r_month])) { error(_("invalid day of month")); - ifree(dp); + free(dp); return; } } - ifree(dp); + free(dp); } static void -convert(val, buf) -const long val; -char * const buf; +convert(const long val, char *const buf) { register int i; register int shift; + unsigned char *const b = (unsigned char *) buf; for (i = 0, shift = 24; i < 4; ++i, shift -= 8) - buf[i] = val >> shift; + b[i] = val >> shift; } static void -convert64(val, buf) -const zic_t val; -char * const buf; +convert64(const zic_t val, char *const buf) { register int i; register int shift; + unsigned char *const b = (unsigned char *) buf; for (i = 0, shift = 56; i < 8; ++i, shift -= 8) - buf[i] = val >> shift; + b[i] = val >> shift; } static void -puttzcode(val, fp) -const long val; -FILE * const fp; +puttzcode(const long val, FILE *const fp) { char buf[4]; convert(val, buf); - (void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp); + (void) fwrite(buf, sizeof buf, 1, fp); } static void -puttzcode64(val, fp) -const zic_t val; -FILE * const fp; +puttzcode64(const zic_t val, FILE *const fp) { char buf[8]; convert64(val, buf); - (void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp); + (void) fwrite(buf, sizeof buf, 1, fp); } static int -atcomp(avp, bvp) -const void * avp; -const void * bvp; +atcomp(const void *avp, const void *bvp) { const zic_t a = ((const struct attype *) avp)->at; const zic_t b = ((const struct attype *) bvp)->at; @@ -1459,16 +1379,13 @@ const void * bvp; } static int -is32(x) -const zic_t x; +is32(const zic_t x) { return INT32_MIN <= x && x <= INT32_MAX; } static void -writezone(name, string) -const char * const name; -const char * const string; +writezone(const char *const name, const char *const string) { register FILE * fp; register int i, j; @@ -1485,8 +1402,7 @@ const char * const string; ** Sort. */ if (timecnt > 1) - (void) qsort((void *) attypes, (size_t) timecnt, - (size_t) sizeof *attypes, atcomp); + (void) qsort(attypes, timecnt, sizeof *attypes, atcomp); /* ** Optimize. */ @@ -1554,7 +1470,7 @@ const char * const string; ++leapi32; } fullname = erealloc(fullname, - (int) (strlen(directory) + 1 + strlen(name) + 1)); + strlen(directory) + 1 + strlen(name) + 1); (void) sprintf(fullname, "%s/%s", directory, name); /* ** Remove old file, if any, to snap links. @@ -1691,8 +1607,7 @@ const char * const string; } indmap[abbrinds[i]] = j; } -#define DO(field) (void) fwrite((void *) tzh.field, \ - (size_t) sizeof tzh.field, (size_t) 1, fp) +#define DO(field) ((void) fwrite(tzh.field, sizeof tzh.field, 1, fp)) tzh = tzh0; (void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic); tzh.tzh_version[0] = ZIC_VERSION; @@ -1720,10 +1635,7 @@ const char * const string; unsigned char uc; uc = typemap[types[i]]; - (void) fwrite((void *) &uc, - (size_t) sizeof uc, - (size_t) 1, - fp); + (void) fwrite(&uc, sizeof uc, 1, fp); } for (i = 0; i < typecnt; ++i) if (writetype[i]) { @@ -1732,9 +1644,8 @@ const char * const string; (void) putc((unsigned char) indmap[abbrinds[i]], fp); } if (thischarcnt != 0) - (void) fwrite((void *) thischars, - (size_t) sizeof thischars[0], - (size_t) thischarcnt, fp); + (void) fwrite(thischars, sizeof thischars[0], + thischarcnt, fp); for (i = thisleapi; i < thisleaplim; ++i) { register zic_t todo; @@ -1756,7 +1667,7 @@ const char * const string; todo = tadd(trans[i], -gmtoffs[j]); } else todo = trans[i]; if (pass == 1) - puttzcode((long) todo, fp); + puttzcode(todo, fp); else puttzcode64(todo, fp); puttzcode(corr[i], fp); } @@ -1776,12 +1687,8 @@ const char * const string; } static void -doabbr(abbr, format, letters, isdst, doquotes) -char * const abbr; -const char * const format; -const char * const letters; -const int isdst; -const int doquotes; +doabbr(char *const abbr, const char *const format, const char *const letters, + const int isdst, const int doquotes) { register char * cp; register char * slashp; @@ -1796,8 +1703,7 @@ const int doquotes; (void) strcpy(abbr, slashp + 1); } else { if (slashp > format) - (void) strncpy(abbr, format, - (unsigned) (slashp - format)); + (void) strncpy(abbr, format, slashp - format); abbr[slashp - format] = '\0'; } if (!doquotes) @@ -1817,8 +1723,7 @@ const int doquotes; } static void -updateminmax(x) -const int x; +updateminmax(const int x) { if (min_year > x) min_year = x; @@ -1827,9 +1732,7 @@ const int x; } static int -stringoffset(result, offset) -char * result; -long offset; +stringoffset(char *result, long offset) { register int hours; register int minutes; @@ -1859,11 +1762,8 @@ long offset; } static int -stringrule(result, rp, dstoff, gmtoff) -char * result; -const struct rule * const rp; -const long dstoff; -const long gmtoff; +stringrule(char *result, const struct rule *const rp, const long dstoff, + const long gmtoff) { register long tod; @@ -1914,10 +1814,7 @@ const long gmtoff; } static void -stringzone(result, zpfirst, zonecount) -char * result; -const struct zone * const zpfirst; -const int zonecount; +stringzone(char *result, const struct zone *const zpfirst, const int zonecount) { register const struct zone * zp; register struct rule * rp; @@ -1997,9 +1894,7 @@ const int zonecount; } static void -outzone(zpfirst, zonecount) -const struct zone * const zpfirst; -const int zonecount; +outzone(const struct zone * const zpfirst, const int zonecount) { register const struct zone * zp; register struct rule * rp; @@ -2070,7 +1965,7 @@ wp = ecpyalloc(_("no POSIX environment variable for zone")); wp = ecatalloc(wp, " "); wp = ecatalloc(wp, zpfirst->z_name); warning(wp); - ifree(wp); + free(wp); } if (envvar[0] == '\0') { if (min_year >= INT_MIN + YEARSPERREPEAT) @@ -2115,7 +2010,7 @@ wp = ecpyalloc(_("no POSIX environment variable for zone")); if (zp->z_nrules == 0) { stdoff = zp->z_stdoff; doabbr(startbuf, zp->z_format, - (char *) NULL, stdoff != 0, FALSE); + NULL, stdoff != 0, FALSE); type = addtype(oadd(zp->z_gmtoff, stdoff), startbuf, stdoff != 0, startttisstd, startttisgmt); @@ -2254,15 +2149,13 @@ error(_("can't determine time zone abbreviation to use just after until time")); } } writezone(zpfirst->z_name, envvar); - ifree(startbuf); - ifree(ab); - ifree(envvar); + free(startbuf); + free(ab); + free(envvar); } static void -addtt(starttime, type) -const zic_t starttime; -int type; +addtt(const zic_t starttime, int type) { if (starttime <= min_time || (timecnt == 1 && attypes[0].at < min_time)) { @@ -2288,12 +2181,8 @@ int type; } static int -addtype(gmtoff, abbr, isdst, ttisstd, ttisgmt) -const long gmtoff; -const char * const abbr; -const int isdst; -const int ttisstd; -const int ttisgmt; +addtype(const long gmtoff, const char *const abbr, const int isdst, + const int ttisstd, const int ttisgmt) { register int i, j; @@ -2348,11 +2237,7 @@ const int ttisgmt; } static void -leapadd(t, positive, rolling, count) -const zic_t t; -const int positive; -const int rolling; -int count; +leapadd(const zic_t t, const int positive, const int rolling, int count) { register int i, j; @@ -2397,16 +2282,14 @@ adjleap(void) } static int -yearistype(year, type) -const int year; -const char * const type; +yearistype(const int year, const char *const type) { static char * buf; int result; if (type == NULL || *type == '\0') return TRUE; - buf = erealloc(buf, (int) (132 + strlen(yitcommand) + strlen(type))); + buf = erealloc(buf, 132 + strlen(yitcommand) + strlen(type)); (void) sprintf(buf, "%s %d %s", yitcommand, year, type); result = system(buf); if (WIFEXITED(result)) switch (WEXITSTATUS(result)) { @@ -2423,17 +2306,15 @@ const char * const type; } static int -lowerit(a) -int a; +lowerit(int a) { a = (unsigned char) a; return (isascii(a) && isupper(a)) ? tolower(a) : a; } -static int -ciequal(ap, bp) /* case-insensitive equality */ -register const char * ap; -register const char * bp; +/* case-insensitive equality */ +static ATTRIBUTE_PURE int +ciequal(register const char *ap, register const char *bp) { while (lowerit(*ap) == lowerit(*bp++)) if (*ap++ == '\0') @@ -2441,10 +2322,8 @@ register const char * bp; return FALSE; } -static int -itsabbr(abbr, word) -register const char * abbr; -register const char * word; +static ATTRIBUTE_PURE int +itsabbr(register const char *abbr, register const char *word) { if (lowerit(*abbr) != lowerit(*word)) return FALSE; @@ -2457,10 +2336,9 @@ register const char * word; return TRUE; } -static const struct lookup * -byword(word, table) -register const char * const word; -register const struct lookup * const table; +static ATTRIBUTE_PURE const struct lookup * +byword(register const char *const word, + register const struct lookup *const table) { register const struct lookup * foundlp; register const struct lookup * lp; @@ -2487,8 +2365,7 @@ register const struct lookup * const table; } static char ** -getfields(cp) -register char * cp; +getfields(register char *cp) { register char * dp; register char ** array; @@ -2496,8 +2373,7 @@ register char * cp; if (cp == NULL) return NULL; - array = (char **) (void *) - emalloc((int) ((strlen(cp) + 1) * sizeof *array)); + array = emalloc((strlen(cp) + 1) * sizeof *array); nsubs = 0; for ( ; ; ) { while (isascii((unsigned char) *cp) && @@ -2528,38 +2404,28 @@ register char * cp; return array; } -static long -oadd(t1, t2) -const long t1; -const long t2; +static ATTRIBUTE_PURE long +oadd(const long t1, const long t2) { - register long t; - - t = t1 + t2; - if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) { + if (t1 < 0 ? t2 < LONG_MIN - t1 : LONG_MAX - t1 < t2) { error(_("time overflow")); exit(EXIT_FAILURE); } - return t; + return t1 + t2; } -static zic_t -tadd(t1, t2) -const zic_t t1; -const long t2; +static ATTRIBUTE_PURE zic_t +tadd(const zic_t t1, const long t2) { - register zic_t t; - if (t1 == max_time && t2 > 0) return max_time; if (t1 == min_time && t2 < 0) return min_time; - t = t1 + t2; - if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) { + if (t1 < 0 ? t2 < min_time - t1 : max_time - t1 < t2) { error(_("time overflow")); exit(EXIT_FAILURE); } - return t; + return t1 + t2; } /* @@ -2568,9 +2434,7 @@ const long t2; */ static zic_t -rpytime(rp, wantedy) -register const struct rule * const rp; -register const int wantedy; +rpytime(register const struct rule *const rp, register const int wantedy) { register int y, m, i; register long dayoff; /* with a nod to Margaret O. */ @@ -2626,12 +2490,12 @@ register const int wantedy; } while (wday != eitol(rp->r_wday)) if (rp->r_dycode == DC_DOWGEQ) { - dayoff = oadd(dayoff, (long) 1); + dayoff = oadd(dayoff, 1); if (++wday >= LDAYSPERWEEK) wday = 0; ++i; } else { - dayoff = oadd(dayoff, (long) -1); + dayoff = oadd(dayoff, -1); if (--wday < 0) wday = LDAYSPERWEEK - 1; --i; @@ -2651,31 +2515,30 @@ will not work with pre-2004 versions of zic")); } static void -newabbr(string) -const char * const string; +newabbr(const char *const string) { register int i; if (strcmp(string, GRANDPARENTED) != 0) { register const char * cp; - register char * wp; + const char * mp; /* ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics ** optionally followed by a + or - and a number from 1 to 14. */ cp = string; - wp = NULL; + mp = NULL; while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp)) ++cp; if (cp - string == 0) -wp = _("time zone abbreviation lacks alphabetic at start"); +mp = _("time zone abbreviation lacks alphabetic at start"); if (noise && cp - string > 3) -wp = _("time zone abbreviation has more than 3 alphabetics"); +mp = _("time zone abbreviation has more than 3 alphabetics"); if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) -wp = _("time zone abbreviation has too many alphabetics"); - if (wp == NULL && (*cp == '+' || *cp == '-')) { +mp = _("time zone abbreviation has too many alphabetics"); + if (mp == NULL && (*cp == '+' || *cp == '-')) { ++cp; if (isascii((unsigned char) *cp) && isdigit((unsigned char) *cp)) @@ -2684,14 +2547,14 @@ wp = _("time zone abbreviation has too many alphabetics"); ++cp; } if (*cp != '\0') -wp = _("time zone abbreviation differs from POSIX standard"); - if (wp != NULL) { - wp = ecpyalloc(wp); +mp = _("time zone abbreviation differs from POSIX standard"); + if (mp != NULL) { + char *wp = ecpyalloc(mp); wp = ecatalloc(wp, " ("); wp = ecatalloc(wp, string); wp = ecatalloc(wp, ")"); warning(wp); - ifree(wp); + free(wp); } } i = strlen(string) + 1; @@ -2704,8 +2567,7 @@ wp = _("time zone abbreviation differs from POSIX standard"); } static int -mkdirs(argname) -char * argname; +mkdirs(char *argname) { register char * name; register char * cp; @@ -2739,20 +2601,19 @@ char * argname; (void) fprintf(stderr, _("%s: Can't create directory %s: %s\n"), progname, name, e); - ifree(name); + free(name); return -1; } } } *cp = '/'; } - ifree(name); + free(name); return 0; } -static long -eitol(i) -const int i; +static ATTRIBUTE_PURE long +eitol(const int i) { long l; -- 1.7.9.5

8 12