Replace getSuffixFromPath() with getFileExtension().

BaseLib/FileTools.cpp

@@ -90,7 +90,7 @@ std::string extractBaseNameWithoutExtension(std::string const& pathname)
 	return dropFileExtension(basename);
 }
 
-std::string getSuffixFromPath(const std::string &path)
+std::string getFileExtension(const std::string &path)
 {
 	const std::string str = extractBaseName(path);
 	const size_t p = findLastDot(str);

BaseLib/FileTools.h

@@ -65,9 +65,9 @@ std::string extractBaseName(std::string const& pathname);
 std::string extractBaseNameWithoutExtension(std::string const& pathname);
 
 /**
- * Extract the file type / suffix from a path
+ * Extract extension from filename
  */
-std::string getSuffixFromPath(const std::string &str);
+std::string getFileExtension(std::string const& filename);
 
 
 /**

FileIO/readMeshFromFile.cpp

@@ -24,7 +24,7 @@ namespace FileIO {
 MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
 {
 	MeshLib::Mesh* mesh (NULL);
-	std::string suffix (BaseLib::getSuffixFromPath(file_name));
+	std::string suffix (BaseLib::getFileExtension(file_name));
 
 	if (suffix.compare("msh") == 0 || suffix.compare("MSH") == 0)
 	{

SimpleTests/MeshTests/MeshRead.cpp

@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 	BaseLib::RunTime run_time;
 	run_time.start();
 	MeshLib::Mesh* mesh(NULL);
-	if (BaseLib::getSuffixFromPath(fname).compare("msh") == 0) {
+	if (BaseLib::getFileExtension(fname).compare("msh") == 0) {
 		mesh = mesh_io.loadMeshFromFile(fname);
 	} else {
 		mesh = FileIO::RapidVtuInterface::readVTUFile(fname);

Tests/BaseLib/TestFilePathStringManipulation.cpp

@@ -33,56 +33,56 @@ TEST(BaseLib, FindLastPathSeparatorUnix)
 	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/path/"), 15 );
 }
 
-TEST(BaseLib, GetSuffixFromPathWin)
+TEST(BaseLib, GetFileExtensionWin)
 {
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path\\"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path\\file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\path\\file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\path\\path\\"), "" );
-
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path.ext\\"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path.ext\\"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\path\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path\\path\\path.ext\\"), "" );
-
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path.wrong\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path.wrong\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path.wrong0\\path.wrong\\file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("\\path.wrong0\\path.wrong\\path.ext\\"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path\\"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path\\file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\path\\"), "" );
+
+	ASSERT_EQ ( BaseLib::getFileExtension("file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path.ext\\"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path.ext\\"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\path.ext\\"), "" );
+
+	ASSERT_EQ ( BaseLib::getFileExtension("path.wrong\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path.wrong\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path.wrong0\\path.wrong\\file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("\\path.wrong0\\path.wrong\\path.ext\\"), "" );
 }
 
-TEST(BaseLib, GetSuffixFromPathUnix)
+TEST(BaseLib, getFileExtensionUnix)
 {
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path/"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path/file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/path/file"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/path/path/"), "" );
-
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path.ext/"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path.ext/"), "" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/path/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path/path/path.ext/"), "" );
-
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("path.wrong/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path.wrong/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path.wrong0/path.wrong/file.ext"), "ext" );
-	ASSERT_EQ ( BaseLib::getSuffixFromPath("/path.wrong0/path.wrong/path.ext/"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path/"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path/file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/path/file"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/path/path/"), "" );
+
+	ASSERT_EQ ( BaseLib::getFileExtension("file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path.ext/"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path.ext/"), "" );
+	ASSERT_EQ ( BaseLib::getFileExtension("path/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/path/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path/path/path.ext/"), "" );
+
+	ASSERT_EQ ( BaseLib::getFileExtension("path.wrong/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path.wrong/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path.wrong0/path.wrong/file.ext"), "ext" );
+	ASSERT_EQ ( BaseLib::getFileExtension("/path.wrong0/path.wrong/path.ext/"), "" );
 }
 
 TEST(BaseLib, CopyPathToFileNameWin)