Ticket #8729: 3_remove_redundant_parameter.patch

common/fs.h

@@ -240 +240 @@
          * are scanned before going into subdirectories.
          * 
          * @param results List to put the matches in.
-         * @param dir Directory to search within.
          * @param pattern Pattern of the files to look for.
          * @param hidden Whether to search hidden files or not.
          * @param exhaustive Whether to continue searching after one match has been found.
          * 
          * @return true if matches could be found, false otherwise.
          */
-        virtual bool lookupFile(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const;
+        virtual bool lookupFile(FSList &results, Common::String &pattern, bool hidden, bool exhaustive) const;
 
 protected:
         /**

common/fs.cpp

@@ -183 +183 @@
         return ((matches > 0) ? true : false);
 }
 
-bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const {
+bool FilesystemNode::lookupFile(FSList &results, Common::String &pattern, bool hidden, bool exhaustive) const {
         int matches;
 
-        if (!dir.isDirectory())
+        if (!isDirectory())
                 return false;
 
+        FilesystemNode dir = *this;
         matches = lookupFileRec(results, dir, pattern, hidden, exhaustive);
 
         return ((matches > 0) ? true : false);

backends/saves/default/default-saves.cpp

@@ -119 +119 @@
         Common::StringList results;
         Common::String search(regex);
 
-        if (savePath.lookupFile(savefiles, savePath, search, false, true)) {
+        if (savePath.lookupFile(savefiles, search, false, true)) {
                 for (FSList::const_iterator file = savefiles.begin(); file != savefiles.end(); file++) {
                         results.push_back(file->getPath());
                 }