Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history 
2005-01-25  Jakub Jelinek  <[email protected]>

	* stdlib/fmtmsg.c (addseverity): Remove new_string variable.
	(free_mem): Don't free string.
	* stdlib/tst-fmtmsg.c: Include string.h.
	(main): Add some more tests.

2005-01-25  Andreas Schwab  <[email protected]>

	* timezone/asia: Update from tzdata2005c.
	* timezone/backward: Likewise.
	* timezone/leapseconds: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.

	* timezone/private.h: Update from tzcode2005c.
	* timezone/tzfile.h: Likewise.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
  • Loading branch information
Ulrich Drepper committed Jan 26, 2005
1 parent 1f25bdd commit 792dcd7
Show file tree
Hide file tree
Showing 13 changed files with 585 additions and 216 deletions.
20 changes: 20 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
2005-01-25 Jakub Jelinek <[email protected]>

* stdlib/fmtmsg.c (addseverity): Remove new_string variable.
(free_mem): Don't free string.
* stdlib/tst-fmtmsg.c: Include string.h.
(main): Add some more tests.

2005-01-25 Andreas Schwab <[email protected]>

* timezone/asia: Update from tzdata2005c.
* timezone/backward: Likewise.
* timezone/leapseconds: Likewise.
* timezone/northamerica: Likewise.
* timezone/southamerica: Likewise.

* timezone/private.h: Update from tzcode2005c.
* timezone/tzfile.h: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.

2005-01-25 Ulrich Drepper <[email protected]>

* sysdeps/i386/dl-machine.h (elf_machine_rel): Remove code using
Expand Down
20 changes: 1 addition & 19 deletions stdlib/fmtmsg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ internal_addseverity (int severity, const char *string)
int result = MM_OK;

/* First see if there is already a record for the severity level. */
for (runp = severity_list, lastp = NULL; runp != NULL; runp = runp-> next)
for (runp = severity_list, lastp = NULL; runp != NULL; runp = runp->next)
if (runp->severity == severity)
break;
else
Expand Down Expand Up @@ -364,34 +364,17 @@ int
addseverity (int severity, const char *string)
{
int result;
const char *new_string;

/* Prevent illegal SEVERITY values. */
if (severity <= MM_INFO)
return MM_NOTOK;

if (string == NULL)
/* We want to remove the severity class. */
new_string = NULL;
else
{
new_string = __strdup (string);

if (new_string == NULL)
/* Allocation failed or illegal value. */
return MM_NOTOK;
}

/* Protect the global data. */
__libc_lock_lock (lock);

/* Do the real work. */
result = internal_addseverity (severity, string);

if (result != MM_OK)
/* Free the allocated string. */
free ((char *) new_string);

/* Release the lock. */
__libc_lock_unlock (lock);

Expand All @@ -408,7 +391,6 @@ libc_freeres_fn (free_mem)
{
/* This is data we have to release. */
struct severity_info *here = runp;
free ((char *) runp->string);
runp = runp->next;
free (here);
}
Expand Down
25 changes: 24 additions & 1 deletion stdlib/tst-fmtmsg.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <fmtmsg.h>
#include <mcheck.h>
#include <stdio.h>
#include <string.h>


#define MM_TEST 10
Expand All @@ -12,11 +13,13 @@ main (void)

mtrace ();

if (addseverity (MM_TEST, "TEST") != MM_OK)
char TEST[] = "ABCD";
if (addseverity (MM_TEST, TEST) != MM_OK)
{
puts ("addseverity failed");
result = 1;
}
strcpy (TEST, "TEST");

if (fmtmsg (MM_PRINT, "GLIBC:tst-fmtmsg", MM_HALT, "halt",
"should print message for MM_HALT", "GLIBC:tst-fmtmsg:1")
Expand Down Expand Up @@ -54,5 +57,25 @@ main (void)
result = 1;
}

if (addseverity (MM_TEST, NULL) != MM_NOTOK)
{
puts ("third addseverity unexpectedly succeeded");
result = 1;
}

char *p = strdup ("TEST2");
if (addseverity (MM_TEST, p) != MM_OK)
{
puts ("fourth addseverity failed");
result = 1;
}
if (addseverity (MM_TEST, "TEST3") != MM_OK)
{
puts ("fifth addseverity failed");
result = 1;
}

free (p);

return result;
}
135 changes: 90 additions & 45 deletions timezone/asia
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @(#)asia 7.77
# @(#)asia 7.78

# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
Expand Down Expand Up @@ -639,7 +639,7 @@ Rule Zion 1988 only - Apr 9 0:00 1:00 D
Rule Zion 1988 only - Sep 3 0:00 0 S

# From Ephraim Silverberg <[email protected]>
# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17 and 2000-07-25):
# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, and 2004-12-22):

# According to the Office of the Secretary General of the Ministry of
# Interior, there is NO set rule for Daylight-Savings/Standard time changes.
Expand Down Expand Up @@ -690,13 +690,13 @@ Rule Zion 1995 only - Sep 3 0:00 0 S
# time, Haim Ramon. The official announcement regarding 1996-1998
# (with the dates for 1997-1998 no longer being relevant) can be viewed at:
#
# ftp://ftp.huji.ac.il/pub/tz/announcements/1996-1998.ramon.ps.gz
# ftp://ftp.cs.huji.ac.il/pub/tz/announcements/1996-1998.ramon.ps.gz
#
# The dates for 1997-1998 were altered by his successor, Rabbi Eli Suissa.
#
# The official announcements for the years 1997-1999 can be viewed at:
#
# ftp://ftp.huji.ac.il/pub/tz/announcements/YYYY.ps.gz
# ftp://ftp.cs.huji.ac.il/pub/tz/announcements/YYYY.ps.gz
#
# where YYYY is the relevant year.

Expand All @@ -716,12 +716,12 @@ Rule Zion 1999 only - Sep 3 2:00 0 S
#
# The official announcement for the start date of 2000 can be viewed at:
#
# ftp://ftp.huji.ac.il/pub/tz/announcements/2000-start.ps.gz
# ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-start.ps.gz
#
# The official announcement for the end date of 2000 and the dates
# for the years 2001-2004 can be viewed at:
#
# ftp://ftp.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
# ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz

# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 2000 only - Apr 14 2:00 1:00 D
Expand All @@ -735,52 +735,97 @@ Rule Zion 2003 only - Oct 3 1:00 0 S
Rule Zion 2004 only - Apr 7 1:00 1:00 D
Rule Zion 2004 only - Sep 22 1:00 0 S

# From Paul Eggert (2000-07-25):
# Here are guesses for rules after 2004.
# They are probably wrong, but they are more likely than no DST at all.
# Yesterday, the Knesset Interior Committee passed a proposed (originally
# in March 2004) change to the Time Setting Law that would make the dates
# for DST from 2005 and beyond so that DST starts on the night _after_ the
# first night of the Passover holiday at midnight until midnight of the
# Saturday night _before_ the fast of Yom Kippur.
#
# Those who can read Hebrew can view the proposal at:
#
# ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+.ps
#
# The proposal still has to be passed by the Knesset (three readings) for
# it to become law....

# From Paul Eggert (2004-12-22):
# For now, guess that the rules proposed on 2004-12-20 will be adopted.
# This is quite possibly wrong, but it is more likely than no DST at all.
# I used Ed Reingold's cal-hebrew in GNU Emacs 21.3, along with code
# written by Ephraim Silverberg, to generate this list.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 2005 max - Apr 1 1:00 1:00 D
Rule Zion 2005 max - Oct 1 1:00 0 S
Rule Zion 2005 only - Apr 25 0:00 1:00 D
Rule Zion 2005 only - Oct 9 0:00 0 S
Rule Zion 2006 only - Apr 14 0:00 1:00 D
Rule Zion 2006 only - Oct 1 0:00 0 S
Rule Zion 2007 only - Apr 4 0:00 1:00 D
Rule Zion 2007 only - Sep 16 0:00 0 S
Rule Zion 2008 only - Apr 21 0:00 1:00 D
Rule Zion 2008 only - Oct 5 0:00 0 S
Rule Zion 2009 only - Apr 10 0:00 1:00 D
Rule Zion 2009 only - Sep 27 0:00 0 S
Rule Zion 2010 only - Mar 31 0:00 1:00 D
Rule Zion 2010 only - Sep 12 0:00 0 S
Rule Zion 2011 only - Apr 20 0:00 1:00 D
Rule Zion 2011 only - Oct 2 0:00 0 S
Rule Zion 2012 only - Apr 8 0:00 1:00 D
Rule Zion 2012 only - Sep 23 0:00 0 S
Rule Zion 2013 only - Mar 27 0:00 1:00 D
Rule Zion 2013 only - Sep 8 0:00 0 S
Rule Zion 2014 only - Apr 16 0:00 1:00 D
Rule Zion 2014 only - Sep 28 0:00 0 S
Rule Zion 2015 only - Apr 5 0:00 1:00 D
Rule Zion 2015 only - Sep 20 0:00 0 S
Rule Zion 2016 only - Apr 24 0:00 1:00 D
Rule Zion 2016 only - Oct 9 0:00 0 S
Rule Zion 2017 only - Apr 12 0:00 1:00 D
Rule Zion 2017 only - Sep 24 0:00 0 S
Rule Zion 2018 only - Apr 1 0:00 1:00 D
Rule Zion 2018 only - Sep 16 0:00 0 S
Rule Zion 2019 only - Apr 21 0:00 1:00 D
Rule Zion 2019 only - Oct 6 0:00 0 S
Rule Zion 2020 only - Apr 10 0:00 1:00 D
Rule Zion 2020 only - Sep 27 0:00 0 S
Rule Zion 2021 only - Mar 29 0:00 1:00 D
Rule Zion 2021 only - Sep 12 0:00 0 S
Rule Zion 2022 only - Apr 17 0:00 1:00 D
Rule Zion 2022 only - Oct 2 0:00 0 S
Rule Zion 2023 only - Apr 7 0:00 1:00 D
Rule Zion 2023 only - Sep 24 0:00 0 S
Rule Zion 2024 only - Apr 24 0:00 1:00 D
Rule Zion 2024 only - Oct 6 0:00 0 S
Rule Zion 2025 only - Apr 14 0:00 1:00 D
Rule Zion 2025 only - Sep 28 0:00 0 S
Rule Zion 2026 only - Apr 3 0:00 1:00 D
Rule Zion 2026 only - Sep 20 0:00 0 S
Rule Zion 2027 only - Apr 23 0:00 1:00 D
Rule Zion 2027 only - Oct 10 0:00 0 S
Rule Zion 2028 only - Apr 12 0:00 1:00 D
Rule Zion 2028 only - Sep 24 0:00 0 S
Rule Zion 2029 only - Apr 1 0:00 1:00 D
Rule Zion 2029 only - Sep 16 0:00 0 S
Rule Zion 2030 only - Apr 19 0:00 1:00 D
Rule Zion 2030 only - Oct 6 0:00 0 S
Rule Zion 2031 only - Apr 9 0:00 1:00 D
Rule Zion 2031 only - Sep 21 0:00 0 S
Rule Zion 2032 only - Mar 28 0:00 1:00 D
Rule Zion 2032 only - Sep 12 0:00 0 S
Rule Zion 2033 only - Apr 15 0:00 1:00 D
Rule Zion 2033 only - Oct 2 0:00 0 S
Rule Zion 2034 only - Apr 5 0:00 1:00 D
Rule Zion 2034 only - Sep 17 0:00 0 S
Rule Zion 2035 only - Apr 25 0:00 1:00 D
Rule Zion 2035 only - Oct 7 0:00 0 S
Rule Zion 2036 only - Apr 13 0:00 1:00 D
Rule Zion 2036 only - Sep 28 0:00 0 S
Rule Zion 2037 only - Apr 1 0:00 1:00 D
Rule Zion 2037 only - Sep 13 0:00 0 S

# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Jerusalem 2:20:56 - LMT 1880
2:20:40 - JMT 1918 # Jerusalem Mean Time?
2:00 Zion I%sT

# From Ephraim Silverberg (2003-03-23):
#
# Minister of Interior Poraz has announced that he will respect the law
# passed in July 2000 (proposed at the time jointly by himself and
# then-MK David Azulai [Shas]) fixing the dates for 2000-2004. Hence,
# the dates for 2003 and 2004 remain unchanged....
#
# As far as 2005 and beyond, no dates have been set. However, the
# minister has mentioned that he wishes to propose to move Israel's
# timezone in 2005 from GMT+2 to GMT+3 and upon that have DST during
# the summer months (i.e. GMT+4). However, no legislation in this
# direction is expected until the latter part of 2004 which is a long
# time off in terms of Israeli politics.

# (2004-09-20):
# The latest rumour, however, is that in 2005, when the clock changes to
# Daylight Saving Time (date as yet unknown), the move will be a two-hour leap
# forward (from UTC+0200 to UTC+0400) and then, in the fall, the clock will
# move back only an hour to UTC+0300 thus effectively moving Israel's timezone
# from UTC+0200 to UTC+0300. However, no actual draft has been put before the
# Knesset (Israel's Parliament) though the intention is to do so this
# month [2004-09].

# (2004-09-26):
# Even though the draft law for the above did pass the Ministerial Committee
# for Legislative Matters three months ago, it was voted down in today's
# Cabinet meeting. The current suggestion is to keep the current timezone at
# UTC+0200 but have an extended period of Daylight Saving Time (UTC+0300) from
# the beginning of Passover holiday in the spring to after the Tabernacle
# holiday in the fall (i.e. the dates of which are governed by the Hebrew
# calendar but this means at least 184 days of DST). However, this is only a
# suggestion that was raised in today's cabinet meeting and has not yet been
# drafted.



###############################################################################
Expand Down
20 changes: 10 additions & 10 deletions timezone/backward
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @(#)backward 7.26
# @(#)backward 7.27

# This file provides links between current names for time zones
# and their old names. Many names changed in late 1993.
Expand All @@ -13,7 +13,7 @@ Link America/Argentina/Jujuy America/Jujuy
Link America/Indiana/Knox America/Knox_IN
Link America/Argentina/Mendoza America/Mendoza
Link America/Rio_Branco America/Porto_Acre
Link America/Cordoba America/Rosario
Link America/Argentina/Cordoba America/Rosario
Link America/St_Thomas America/Virgin
Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Chongqing Asia/Chungking
Expand All @@ -34,7 +34,7 @@ Link Australia/Hobart Australia/Tasmania
Link Australia/Melbourne Australia/Victoria
Link Australia/Perth Australia/West
Link Australia/Broken_Hill Australia/Yancowinna
Link America/Porto_Acre Brazil/Acre
Link America/Rio_Branco Brazil/Acre
Link America/Noronha Brazil/DeNoronha
Link America/Sao_Paulo Brazil/East
Link America/Manaus Brazil/West
Expand All @@ -55,10 +55,10 @@ Link Europe/Dublin Eire
Link Europe/Chisinau Europe/Tiraspol
Link Europe/London GB
Link Europe/London GB-Eire
Link Etc/GMT+0 GMT+0
Link Etc/GMT-0 GMT-0
Link Etc/GMT0 GMT0
Link Etc/Greenwich Greenwich
Link Etc/GMT GMT+0
Link Etc/GMT GMT-0
Link Etc/GMT GMT0
Link Etc/GMT Greenwich
Link Asia/Hong_Kong Hongkong
Link Atlantic/Reykjavik Iceland
Link Asia/Tehran Iran
Expand All @@ -70,7 +70,7 @@ Link Africa/Tripoli Libya
Link America/Tijuana Mexico/BajaNorte
Link America/Mazatlan Mexico/BajaSur
Link America/Mexico_City Mexico/General
Link America/Shiprock Navajo
Link America/Denver Navajo
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link Pacific/Pago_Pago Pacific/Samoa
Expand All @@ -95,6 +95,6 @@ Link America/Denver US/Mountain
Link America/Los_Angeles US/Pacific
Link Pacific/Pago_Pago US/Samoa
Link Etc/UTC UTC
Link Etc/Universal Universal
Link Etc/UTC Universal
Link Europe/Moscow W-SU
Link Etc/Zulu Zulu
Link Etc/UTC Zulu
Loading

0 comments on commit 792dcd7

Please sign in to comment.