Proceed to look for the next timezone when matching a localized

mhagander · mhagander · commit 6efb081e1023 · 2010-04-08T11:25:58.000Z
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
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
  * 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)
 					(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",
 									 keyname, (int) r)));
 			RegCloseKey(key);
-			break;
+			continue; /* Proceed to look at the next timezone */
 		}
 		if (strcmp(tzname, zonename) == 0)
 		{
@@ -1111,7 +1111,7 @@ identify_system_timezone(void)
 					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",
 									 keyname, (int) r)));
 			RegCloseKey(key);
-			break;
+			continue; /* Proceed to look at the next timezone */
 		}
 		if (strcmp(tzname, zonename) == 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.68 2010/04/06 20:35:11 mha Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.69 2010/04/08 11:25:58 mha Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -1094,7 +1094,7 @@ identify_system_timezone(void)`
`1094`	`1094`	`(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",`
`1095`	`1095`	`keyname, (int) r)));`
`1096`	`1096`	`RegCloseKey(key);`
`1097`		`- break;`
	`1097`	`+ continue; /* Proceed to look at the next timezone */`
`1098`	`1098`	`}`
`1099`	`1099`	`if (strcmp(tzname, zonename) == 0)`
`1100`	`1100`	`{`
`@@ -1111,7 +1111,7 @@ identify_system_timezone(void)`
`1111`	`1111`	`(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",`
`1112`	`1112`	`keyname, (int) r)));`
`1113`	`1113`	`RegCloseKey(key);`
`1114`		`- break;`
	`1114`	`+ continue; /* Proceed to look at the next timezone */`
`1115`	`1115`	`}`
`1116`	`1116`	`if (strcmp(tzname, zonename) == 0)`
`1117`	`1117`	`{`