Rename PBD::sys::inodes_same to equivalent_paths

This better reflects its function and more closely matches boost
naming(which is usually a good sign)

git-svn-id: svn://localhost/ardour2/branches/3.0@12857 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index d401caa037d0406cdcd0f4119b8d74fdaececee5..ba2b809dbe9a2b9685de9ecf3840ab5ec38e2880 100644 (file)
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -277,7 +277,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
                        ++j;
                        
                        while (j != hits.end()) {
-                               if (PBD::sys::inodes_same (*i, *j)) {
+                               if (PBD::sys::equivalent_paths (*i, *j)) {
                                        /* *i and *j are the same file; break out of the loop early */
                                        break;
                                }

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index a6a9041ab1b5b5db88e41abbbe09531c7d401e0e..ed90bccb7f92b33ebccff2459cd99c97ee8a3d7b 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -4528,7 +4528,7 @@ Session::ensure_search_path_includes (const string& path, DataType type)
 
                   On Windows, I think we could just do if (*i == path) here.
                */
-               if (PBD::sys::inodes_same (*i, path)) {
+               if (PBD::sys::equivalent_paths (*i, path)) {
                        return;
                }
        }

diff --git a/libs/pbd/filesystem.cc b/libs/pbd/filesystem.cc
index fc4676a38d657b09ca29001b3ff64824416d041a..244acefe43e121b00a850d9f3db98ecf80ac72a8 100644 (file)
--- a/libs/pbd/filesystem.cc
+++ b/libs/pbd/filesystem.cc
@@ -221,12 +221,12 @@ get_absolute_path (const path & p)
 
 /** @return true if a and b have the same inode */
 bool
-inodes_same (const path& a, const path& b)
+equivalent_paths (const std::string& a, const std::string& b)
 {
        struct stat bA;
-       int const rA = g_stat (a.to_string().c_str(), &bA);
+       int const rA = g_stat (a.c_str(), &bA);
        struct stat bB;
-       int const rB = g_stat (b.to_string().c_str(), &bB);
+       int const rB = g_stat (b.c_str(), &bB);
 
        return (rA == 0 && rB == 0 && bA.st_dev == bB.st_dev && bA.st_ino == bB.st_ino);
 }
@@ -239,7 +239,7 @@ bool
 path_is_within (path const & haystack, path needle)
 {
        while (1) {
-               if (inodes_same (haystack, needle)) {
+               if (equivalent_paths (haystack.to_string(), needle.to_string())) {
                        return true;
                }
 

diff --git a/libs/pbd/pbd/filesystem.h b/libs/pbd/pbd/filesystem.h
index aa9f9ef5021bebf5679316b940b2625f2f94e75e..c347f3cc426f8ae76c542186eb1b964ce99d3b2a 100644 (file)
--- a/libs/pbd/pbd/filesystem.h
+++ b/libs/pbd/pbd/filesystem.h
@@ -192,7 +192,7 @@ path get_absolute_path (const path &);
 
 bool path_is_within (const path &, path);      
 
-bool inodes_same (const path &, const path &);
+bool equivalent_paths (const std::string &, const std::string &);
 
 } // namespace sys