Changeset 3468 for trunk/src

Timestamp:

May 1, 2000, 1:28:42 AM (25 years ago)

Author:

phaller

Message:

Fix: PathFindFilename 3x faster now, just a test for the profiling

File:

• trunk/src/shell32/shellpath.cpp (modified) (2 diffs)

trunk/src/shell32/shellpath.cpp

@@ -1 @@
-/* $Id: shellpath.cpp,v 1.8 2000-03-28 15:28:52 cbratschi Exp $ */
+/* $Id: shellpath.cpp,v 1.9 2000-04-30 23:28:42 phaller Exp $ */
 
 /*
@@ -253 +253 @@
 ODINFUNCTION1(LPCSTR, PathFindFilenameA,
               LPCSTR, aptr)
-{  LPCSTR aslash;
-   aslash = aptr;
-
-   TRACE("%s\n",aslash);
-   while (aptr[0])
-   { if (((aptr[0]=='\\') || (aptr[0]==':')) && aptr[1] && aptr[1]!='\\')
-         aslash = aptr+1;
-     aptr++;
-   }
-   return aslash;
-
-}
+{
+  int iLength = strlen(aptr);
+  LPSTR strSlash = (LPSTR)aptr + iLength - 1;
+  
+  while (iLength--)
+  {
+    if ( (*strSlash == '/' ) ||
+         (*strSlash == '\\') )
+      return strSlash + 1;
+  }
+  
+  // no slash found, look for ":"
+  if (aptr[1] == ':')
+    return aptr+2;
+  
+  return aptr; // no slash and no drive found
+}
+
 ODINFUNCTION1(LPCWSTR, PathFindFilenameW,
               LPCWSTR, wptr)