Commit 6efb081e authored by Magnus Hagander's avatar Magnus Hagander

Proceed to look for the next timezone when matching a localized

Windows timezone name where the information in the registry is
incomplete, instead of aborting.

This fixes cases when the registry information is incomplete for
a timezone that is alphabetically before the one that is in use.

Per report from Alexander Forschner
parent 1c850fa8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.68 2010/04/06 20:35:11 mha Exp $ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.69 2010/04/08 11:25:58 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1094,7 +1094,7 @@ identify_system_timezone(void) ...@@ -1094,7 +1094,7 @@ identify_system_timezone(void)
(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i", (errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",
keyname, (int) r))); keyname, (int) r)));
RegCloseKey(key); RegCloseKey(key);
break; continue; /* Proceed to look at the next timezone */
} }
if (strcmp(tzname, zonename) == 0) if (strcmp(tzname, zonename) == 0)
{ {
...@@ -1111,7 +1111,7 @@ identify_system_timezone(void) ...@@ -1111,7 +1111,7 @@ identify_system_timezone(void)
(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i", (errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",
keyname, (int) r))); keyname, (int) r)));
RegCloseKey(key); RegCloseKey(key);
break; continue; /* Proceed to look at the next timezone */
} }
if (strcmp(tzname, zonename) == 0) if (strcmp(tzname, zonename) == 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment