remove crashing lines

diff --git a/source/tools/tzcode/tz2icu.cpp b/source/tools/tzcode/tz2icu.cpp
index 0b32a4d..06f96d9 100644 (file)
--- a/source/tools/tzcode/tz2icu.cpp
+++ b/source/tools/tzcode/tz2icu.cpp
@@ -143,7 +143,7 @@ struct ZoneType {
     bool isdst;\r
     bool isstd;\r
     bool isgmt;\r
-    \r
+\r
     ZoneType(const SimplifiedZoneType&); // used by optimizeTypeList\r
 \r
     ZoneType() : rawoffset(-1), dstoffset(-1), abbr(-1) {}\r
@@ -380,7 +380,7 @@ void readzoneinfo(ifstream& file, ZoneInfo& info, bool is64bitData) {
                     info.transitions.push_back(Transition(transitionTimes[i], transitionTypes[i]));\r
                 }\r
             }\r
-    \r
+\r
             if (minidx != -1) {\r
                 // If there are any transitions before the 32bit minimum time,\r
                 // put the type information with the 32bit minimum time\r
@@ -398,7 +398,7 @@ void readzoneinfo(ifstream& file, ZoneInfo& info, bool is64bitData) {
     }\r
 \r
     // Read types (except for the isdst and isgmt flags, which come later (why??))\r
-    for (i=0; i<typecnt; ++i) { \r
+    for (i=0; i<typecnt; ++i) {\r
         ZoneType type;\r
 \r
         type.rawoffset = readcoded(file);\r
@@ -428,7 +428,7 @@ void readzoneinfo(ifstream& file, ZoneInfo& info, bool is64bitData) {
         if (info.types.at(0).dstoffset != 0) {\r
             // Initial type's rawoffset is same with the rawoffset after the\r
             // first transition, but no DST is observed.\r
-            int64_t rawoffset0 = (info.types.at(info.transitions.at(0).type)).rawoffset;    \r
+            int64_t rawoffset0 = (info.types.at(info.transitions.at(0).type)).rawoffset;\r
             // Look for matching type\r
             for (i=0; i<(int32_t)info.types.size(); ++i) {\r
                 if (info.types.at(i).rawoffset == rawoffset0\r
@@ -484,7 +484,7 @@ void readzoneinfo(ifstream& file, ZoneInfo& info, bool is64bitData) {
                 // make the array "abc", "def", "bc", and translate 1\r
                 // => 2.  NOT CRITICAL since we don't even use the\r
                 // abbr at this time.\r
-#if 0                \r
+#if 0\r
                 // TODO: Re-enable this warning if we start using\r
                 // the Olson abbr data, or if the above TODO is completed.\r
                 ostringstream os;\r
@@ -606,7 +606,7 @@ void handleFile(string path, string id) {
 void scandir(string dirname, string prefix="") {\r
     HANDLE          hList;\r
     WIN32_FIND_DATA FileData;\r
-    \r
+\r
     // Get the first file\r
     hList = FindFirstFile((dirname + "\\*").c_str(), &FileData);\r
     if (hList == INVALID_HANDLE_VALUE) {\r
@@ -630,7 +630,7 @@ void scandir(string dirname, string prefix="") {
                 exit(1);\r
             }\r
         }\r
-        \r
+\r
         if (!FindNextFile(hList, &FileData)) {\r
             if (GetLastError() == ERROR_NO_MORE_FILES) {\r
                 break;\r
@@ -1157,7 +1157,7 @@ operator<<(ostream& os, const ZoneMap& zoneinfo) {
     return os;\r
 }\r
 \r
-// print the string list \r
+// print the string list\r
 ostream& printStringList( ostream& os, const ZoneMap& zoneinfo) {\r
   int32_t n = 0; // count\r
   int32_t col = 0; // column\r
@@ -1488,9 +1488,9 @@ int main(int argc, char *argv[]) {
         return 1;\r
     }\r
 \r
-    cout << "Finished reading " << ZONEINFO.size() << " zoneinfo files ["\r
-         << (ZONEINFO.begin())->first << ".."\r
-         << (--ZONEINFO.end())->first << "]" << endl;\r
+    // cout << "Finished reading " << ZONEINFO.size() << " zoneinfo files ["\r
+    //      << (ZONEINFO.begin())->first << ".."\r
+    //      << (--ZONEINFO.end())->first << "]" << endl;\r
 \r
     // Overrides TZ database zones with ICU custom zone definition.\r
     // These ICU zone overrides are defined in icuzones, with suffix --ICU.\r
@@ -1578,7 +1578,7 @@ int main(int argc, char *argv[]) {
     // Process links (including ICU aliases).  For each link set we have\r
     // a canonical ID (e.g., America/Los_Angeles) and a set of one or more\r
     // aliases (e.g., PST, PST8PDT, ...).\r
-    \r
+\r
     // 1. Add all aliases as zone objects in ZONEINFO\r
     for (map<string,set<string> >::const_iterator i = links.begin();\r
          i!=links.end(); ++i) {\r
@@ -1594,7 +1594,7 @@ int main(int argc, char *argv[]) {
             ZONEINFO[*j] = ZoneInfo();\r
         }\r
     }\r
- \r
+\r
     // 2. Create a mapping from zones to index numbers 0..n-1.\r
     map<string,int32_t> zoneIDs;\r
     vector<string> zoneIDlist;\r
@@ -1870,7 +1870,7 @@ int main(int argc, char *argv[]) {
     }\r
 \r
     file.close();\r
-     \r
+\r
     if (file) { // recheck error bit\r
         cout << "Finished writing " << TZ_RESOURCE_NAME << ".txt" << endl;\r
     } else {\r