diff options
Diffstat (limited to 'src/tools/win32tzlist.pl')
| -rwxr-xr-x | src/tools/win32tzlist.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl index 97484016bb9..df127d965fa 100755 --- a/src/tools/win32tzlist.pl +++ b/src/tools/win32tzlist.pl @@ -75,14 +75,14 @@ $pgtz = $1; # Extract each individual record from the struct while ($pgtz =~ - m/{\s+"([^"]+)",\s+"([^"]+)",\s+"([^"]+)",?\s+},\s+\/\*(.+?)\*\//gs) + m/{\s+\/\*(.+?)\*\/\s+"([^"]+)",\s+"([^"]+)",\s+"([^"]+)",?\s+},/gs) { push @file_zones, { - 'std' => $1, - 'dlt' => $2, - 'match' => $3, - 'display' => clean_displayname($4), + 'display' => clean_displayname($1), + 'std' => $2, + 'dlt' => $3, + 'match' => $4, }; } @@ -132,8 +132,8 @@ sub clean_displayname { my $dn = shift; - $dn =~ s/\s+/ /gs; $dn =~ s/\*//gs; + $dn =~ s/\s+/ /gs; $dn =~ s/^\s+//gs; $dn =~ s/\s+$//gs; return $dn; |