[llvm-commits] [llvm] r50826 - /llvm/trunk/include/llvm/ADT/StringExtras.h

[Ted Kremenek]

Author: kremenek
Date: Wed May  7 14:22:36 2008
New Revision: 50826

URL: http://llvm.org/viewvc/llvm-project?rev=50826&view=rev
Log:
Fix some serious logical errors in CStrInCStrNoCase pointed out by Bill.

Modified:
    llvm/trunk/include/llvm/ADT/StringExtras.h

Modified: llvm/trunk/include/llvm/ADT/StringExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringExtras.h?rev=50826&r1=50825&r2=50826&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ADT/StringExtras.h (original)
+++ llvm/trunk/include/llvm/ADT/StringExtras.h Wed May  7 14:22:36 2008
@@ -144,26 +144,29 @@
   
 /// CStrInCStrNoCase - Portable version of strcasestr.  Locates the first
 ///  occurance of c-string 's1' in string 's2', ignoring case.  Returns
-///  NULL if 's1' cannot be found.
+///  NULL if 's1' cannot be found.  NOTE: the arguments are provided
+///  in a different order than strcasestr.
 static inline const char* CStrInCStrNoCase(const char *s1, const char *s2) {
 
   // Are either strings NULL or empty?
   if (!s1 || !s2 || s1[0] == '\0' || s2[0] == '\0')
     return 0;
   
+  if (s1 == s2)
+    return s1;
+  
   const char *I1=s1, *I2=s2;
   
   while (*I1 != '\0' || *I2 != '\0' )
     if (tolower(*I1) != tolower(*I2)) { // No match.  Start over.
-      ++s1; I1 = s1; I2 = s2;
+      ++s2; I1 = s1; I2 = s2;
     }
     else { // Character match.  Advance to the next character.
       ++I1; ++I2;
     }
 
-  // If we exhausted all of the characters in 's2', then 's1' does not occur
-  // in it.
-  return *I2 == '\0' ? 0 : I1;
+  // If we exhausted all of the characters in 's1', then 's1' appears in 's2'.
+  return *I1 == '\0' ? s2 : 0;
 }
 
 /// getToken - This function extracts one token from source, ignoring any