Backed out changeset 8f614217727a (bug 1448771) for android bustages at /builds/worker/workspace/build/src/intl/hyphenation/hyphen/hyphen.c:444 a=backout
authorAndreea Pavel <apavel@mozilla.com>
Tue, 27 Mar 2018 13:41:58 +0300
changeset 410165 6d13f96e55e0b86d6f4f0c3bd59ff0b5434e08c9
parent 410158 97cdd8febc40ac6025bce5dec9f8dadb8e62f906
child 410166 b906009d875d1f5d29b0d1252cdb43a9b1a5889c
child 410266 0c4f6d832b20370c43b75f89381ff4d871c9d299
push id101399
push userapavel@mozilla.com
push dateTue, 27 Mar 2018 12:11:23 +0000
treeherdermozilla-inbound@2e09d90913fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1448771
milestone61.0a1
backs out8f614217727ae5bf3742ce7623df0433d61c3274
first release with
nightly linux32
6d13f96e55e0 / 61.0a1 / 20180327105613 / files
nightly linux64
6d13f96e55e0 / 61.0a1 / 20180327105613 / files
nightly mac
6d13f96e55e0 / 61.0a1 / 20180327105613 / files
nightly win32
6d13f96e55e0 / 61.0a1 / 20180327105613 / files
nightly win64
6d13f96e55e0 / 61.0a1 / 20180327105613 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8f614217727a (bug 1448771) for android bustages at /builds/worker/workspace/build/src/intl/hyphenation/hyphen/hyphen.c:444 a=backout
intl/hyphenation/hyphen/hyphen.c
--- a/intl/hyphenation/hyphen/hyphen.c
+++ b/intl/hyphenation/hyphen/hyphen.c
@@ -433,35 +433,21 @@ for (k = 0; k < 2; k++) {
     dict[k]->utf8 = (strcmp(dict[k]->cset, "UTF-8") == 0);
   } else {
     strncpy(dict[k]->cset, dict[0]->cset, sizeof(dict[k]->cset)-1);
     dict[k]->cset[sizeof(dict[k]->cset)-1] = '\0';
     dict[k]->utf8 = dict[0]->utf8;
   }
 
   if (k == 0 || nextlevel) {
-    while (fgets(buf, sizeof(buf), f) != NULL) {
-      
-      /* discard lines that don't fit in buffer */
-      if (!feof(f) && strchr(buf, '\n') == NULL) {
-        int c;
-        while ((c = fgetc(f)) != '\n' && c != EOF);
-        /* issue warning if not a comment */
-        if (buf[0] != '%') {
-          fprintf(stderr, "Warning: skipping too long pattern (more than %lu chars)\n", sizeof(buf));
-        }
-        continue;
-      }
-      
+    while (fgets (buf, sizeof(buf), f) != NULL) {
       if (strncmp(buf, "NEXTLEVEL", 9) == 0) {
-        nextlevel = 1;
-        break;
-      } else if (buf[0] != '%') {
-        hnj_hyphen_load_line(buf, dict[k], hashtab);
-      }
+	nextlevel = 1;
+	break;
+      } else if (buf[0] != '%') hnj_hyphen_load_line(buf, dict[k], hashtab);
     }
   } else if (k == 1) {
     /* default first level: hyphen and ASCII apostrophe */
     if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN ',-\n", dict[k], hashtab);
     else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99,-\n", dict[k], hashtab);
     strncpy(buf, "1-1\n", MAX_CHARS-1); /* buf rewritten by hnj_hyphen_load here */
     buf[MAX_CHARS-1] = '\0';
     hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */