Changeset 11185

Timestamp:

03/10/10 13:04:14 (3 years ago)

Author:

robert

Message:

Refactored the find_last_of to simplify it.

Files:

• OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp

@@ -34 +34 @@
 std::string osgDB::getFilePath(const std::string& fileName)
 {
-    std::string::size_type slash1 = fileName.find_last_of('/');
-    std::string::size_type slash2 = fileName.find_last_of('\\');
-    if (slash1==std::string::npos) 
-    {
-        if (slash2==std::string::npos) return std::string();
-        return std::string(fileName,0,slash2);
-    }
-    if (slash2==std::string::npos) return std::string(fileName,0,slash1);
-    return std::string(fileName, 0, slash1>slash2 ?  slash1 : slash2);
+    std::string::size_type slash = fileName.find_last_of("/\\");
+    if (slash==std::string::npos) return std::string();
+    else return std::string(fileName, 0, slash);
 }
 
@@ -48 +42 @@
 std::string osgDB::getSimpleFileName(const std::string& fileName)
 {
-    std::string::size_type slash1 = fileName.find_last_of('/');
-    std::string::size_type slash2 = fileName.find_last_of('\\');
-    if (slash1==std::string::npos) 
-    {
-        if (slash2==std::string::npos) return fileName;
-        return std::string(fileName.begin()+slash2+1,fileName.end());
-    }
-    if (slash2==std::string::npos) return std::string(fileName.begin()+slash1+1,fileName.end());
-    return std::string(fileName.begin()+(slash1>slash2?slash1:slash2)+1,fileName.end());
+    std::string::size_type slash = fileName.find_last_of("/\\");
+    if (slash==std::string::npos) return fileName;
+    else return std::string(fileName.begin()+slash+1,fileName.end());
 }