Tweak ruleset calculation

semenko · diracdeltas · commit 0a6c2ae1ce7d · 2014-01-03T10:50:31.000-08:00
Stop building unused test rules for the TLD itself (e.g. www.example.*) Also remove an intermediate varible assignment. Signed-off-by: Nick Semenkovich <semenko@alum.mit.edu>
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -192,21 +192,21 @@ RuleSets.prototype = {
     }
     log(DBUG, "Ruleset cache miss for " + host);
 
-    var tmp, t;
+    var tmp;
     var results = [];
     if (this.targets[host]) {
       // Copy the host targets so we don't modify them.
       results = this.targets[host].slice();
     }
 
-    // replace each portion of the domain with a * in turn
+    // Replace each portion of the domain with a * in turn
     var segmented = host.split(".");
-    for (var i = 0; i < segmented.length; ++i) {
+    // length-1 to skip the TLD (there are no www.domain.* rules).
+    for (var i = 0; i < segmented.length - 1; ++i) {
       tmp = segmented[i];
       segmented[i] = "*";
-      t = segmented.join(".");
+      this.setInsert(results, this.targets[segmented.join(".")]);
       segmented[i] = tmp;
-      this.setInsert(results, this.targets[t]);
     }
     // now eat away from the left, with *, so that for x.y.z.google.com we
     // check *.z.google.com and *.google.com (we did *.y.z.google.com above)
