Changeset 102458 in vbox for trunk/src/libs/xpcom18a4/xpcom/string

Timestamp:

Dec 4, 2023 5:54:51 PM (15 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160601

Message:

libs/xpcom: Get rid of PL_strcasecmp/PL_strncasecmp and replace with IPRT equivalents, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/string/src

Files:

• nsStringComparator.cpp (modified) (2 diffs)
• nsStringObsolete.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/string/src/nsStringComparator.cpp

@@ -36 +36 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#include <iprt/string.h>
 
 #include <ctype.h>
 #include "nsAString.h"
-#include "plstr.h"
-
 
   // define nsStringComparator
@@ -56 +55 @@
 nsCaseInsensitiveCStringComparator::operator()( const char_type* lhs, const char_type* rhs, PRUint32 aLength ) const
   {
-    PRInt32 result=PRInt32(PL_strncasecmp(lhs, rhs, aLength));
+    PRInt32 result=PRInt32(RTStrNICmp(lhs, rhs, aLength));
     //Egads. PL_strncasecmp is returning *very* negative numbers.
     //Some folks expect -1,0,1, so let's temper its enthusiasm.

trunk/src/libs/xpcom18a4/xpcom/string/src/nsStringObsolete.cpp

@@ -289 +289 @@
   PRInt32 result=0;
   if(aIgnoreCase)
-    result=PRInt32(PL_strncasecmp(aStr1, aStr2, aCount));
+    result=PRInt32(RTStrNICmp(aStr1, aStr2, aCount));
   else
     result=nsCharTraits<char>::compare(aStr1,aStr2,aCount);