Changeset 102457 in vbox for trunk/src/libs/xpcom18a4/xpcom/ds

Timestamp:

Dec 4, 2023 5:24:33 PM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Get rid of PL_strcmp/PL_strncmp and replace with IPRT equivalents, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/ds

Files:

• nsAtomTable.cpp (modified) (2 diffs)
• nsCRT.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/xpcom/ds/nsAtomTable.cpp

@@ -36 +36 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#include <iprt/string.h>
 
 #include "nsAtomTable.h"
@@ -181 +182 @@
   const AtomTableEntry *he = NS_STATIC_CAST(const AtomTableEntry*, entry);
   const char* keyStr = NS_STATIC_CAST(const char*, key);
-  return nsCRT::strcmp(keyStr, he->get()) == 0;
+  return RTStrCmp(keyStr, he->get()) == 0;
 }
 

trunk/src/libs/xpcom18a4/xpcom/ds/nsCRT.h

@@ -146 +146 @@
   }                                                                             
 
-  /// Compare s1 and s2.
-  static PRInt32 strcmp(const char* s1, const char* s2) {
-    return PRInt32(PL_strcmp(s1, s2));
-  }
-
-  static PRInt32 strncmp(const char* s1, const char* s2,
-                         PRUint32 aMaxLen) {
-    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
-  }
-
   /// Case-insensitive string comparison.
   static PRInt32 strcasecmp(const char* s1, const char* s2) {
@@ -169 +159 @@
       result=-1;
     return result;
-  }
-
-  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
-    // inline the first test (assumes strings are not null):
-    PRInt32 diff = ((const unsigned char*)s1)[0] - ((const unsigned char*)s2)[0];
-    if (diff != 0) return diff;
-    return PRInt32(PL_strncmp(s1,s2,unsigned(aMaxLen)));
   }