Issue 192 - Clean up from #153

lib/filterStorage.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 355 matching lines @@
       return;
 
     TimeLine.enter("Entered FilterStorage.loadFromDisk()");
     this._loading = true;
 
     let readFile = function(sourceFile, backupIndex)
     {
       TimeLine.enter("FilterStorage.loadFromDisk() -> readFile()");
 
       let parser = new INIParser();
-      IO.readFromFile(sourceFile, true, parser, function(e)
+      IO.readFromFile(sourceFile, parser, function(e)
       {
         TimeLine.enter("FilterStorage.loadFromDisk() read callback");
         if (!e && parser.subscriptions.length == 0)
         {
           // No filter subscriptions in the file, this isn't right.
           e = new Error("No data in the file");
         }
 
         if (e)
           Cu.reportError(e);
@@ skipping 181 matching lines @@
     TimeLine.enter("Entered FilterStorage.saveToDisk()");
 
     // Make sure the file's parent directory exists
     try {
       targetFile.parent.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
     } catch (e) {}
 
     let writeFilters = function()
     {
       TimeLine.enter("FilterStorage.saveToDisk() -> writeFilters()");
-      IO.writeToFile(targetFile, true, this._generateFilterData(subscriptions), function(e)
+      IO.writeToFile(targetFile, this._generateFilterData(subscriptions), function(e)
       {
         TimeLine.enter("FilterStorage.saveToDisk() write callback");
         if (!explicitFile)
           this._saving = false;
 
         if (e)
           Cu.reportError(e);
 
         if (!explicitFile && this._needsSave)
         {
@@ skipping 296 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };