Changeset 102458 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (2 diffs)
• ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp (modified) (1 diff)
• ipc/ipcd/shared/src/ipcStringList.h (modified) (2 diffs)
• nsprpub/lib/libc (deleted)
• vboxdeps.cpp (modified) (2 diffs)
• xpcom/base/nsDebugImpl.cpp (modified) (1 diff)
• xpcom/base/nsTraceRefcntImpl.cpp (modified) (1 diff)
• xpcom/components/nsComponentManager.cpp (modified) (2 diffs)
• xpcom/components/nsNativeComponentLoader.cpp (modified) (4 diffs)
• xpcom/ds/nsCRT.h (modified) (2 diffs)
• xpcom/reflect/xptinfo/src/xptiMisc.cpp (modified) (1 diff)
• xpcom/reflect/xptinfo/src/xptiprivate.h (modified) (1 diff)
• xpcom/string/src/nsStringComparator.cpp (modified) (2 diffs)
• xpcom/string/src/nsStringObsolete.cpp (modified) (1 diff)
• xpcom/tests/TestCRT.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -155 +155 @@
         nsprpub/lib/ds/plarenas.h \
         nsprpub/lib/ds/plhash.h \
-        nsprpub/lib/libc/include/plstr.h \
         nsprpub/pr/include/prbit.h \
         nsprpub/pr/include/prclist.h \
@@ -389 +388 @@
         nsprpub/lib/ds/plarena.c \
         nsprpub/lib/ds/plhash.c \
-        nsprpub/lib/libc/src/strccmp.c \
         nsprpub/pr/src/pthreads/ptsynch.c
 

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp

@@ -41 +41 @@
 #include "nsIServiceManager.h"
 #include "nsReadableUtils.h"
-#include "plstr.h"
 #include "ipcITransactionObserver.h"
 #include "tmTransaction.h"

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcStringList.h

@@ -39 +39 @@
 #define ipcStringList_h__
 
+#include <iprt/string.h>
+
 #include <string.h>
-#include "plstr.h"
 #include "nscore.h"
 #include "ipcList.h"
@@ -56 +57 @@
 
     PRBool Equals(const char *val) const { return strcmp(mData, val) == 0; }
-    PRBool EqualsIgnoreCase(const char *val) const { return PL_strcasecmp(mData, val) == 0; }
+    PRBool EqualsIgnoreCase(const char *val) const { return RTStrICmp(mData, val) == 0; }
 
     class ipcStringNode *mNext;

trunk/src/libs/xpcom18a4/vboxdeps.cpp

@@ -2 +2 @@
 
 
-#include <plstr.h>
 #include <nsDeque.h>
 #include <nsHashSets.h>
@@ -14 +13 @@
 uintptr_t deps[] =
 {
-    (uintptr_t)PL_strcasecmp,
     (uintptr_t)PL_HashString,
     (uintptr_t)NS_ProxyRelease,

trunk/src/libs/xpcom18a4/xpcom/base/nsDebugImpl.cpp

@@ -41 +41 @@
 #include "nsDebugImpl.h"
 #include "nsDebug.h"
-#include "plstr.h"
 #include "nsError.h"
 

trunk/src/libs/xpcom18a4/xpcom/base/nsTraceRefcntImpl.cpp

@@ -43 +43 @@
 #include "nsISupports.h"
 #include "nsVoidArray.h"
-#include "plstr.h"
 #include <stdlib.h>
 #include "nsCOMPtr.h"

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -2905 +2905 @@
     nsFactoryEntry* factoryEntry = entry->mFactoryEntry;
     if (data->cid->Equals(factoryEntry->mCid) &&
-        ((data->regName && !PL_strcasecmp(factoryEntry->mLocation, data->regName)) ||
+        ((data->regName && !RTStrICmp(factoryEntry->mLocation, data->regName)) ||
          (data->factory && data->factory == factoryEntry->mFactory.get())))
         return PL_DHASH_REMOVE;
@@ -2983 +2983 @@
     // next check to see if there is a CID registered
     old = GetFactoryEntry(aClass);
-    if (old && old->mLocation && !PL_strcasecmp(old->mLocation, registryName))
+    if (old && old->mLocation && !RTStrICmp(old->mLocation, registryName))
     {
         nsAutoMonitor mon(mMon);

trunk/src/libs/xpcom18a4/xpcom/components/nsNativeComponentLoader.cpp

@@ -60 +60 @@
 
 #include <iprt/assert.h>
+#include <iprt/string.h>
 #include <VBox/log.h>
 
@@ -205 +206 @@
                     if (   NS_FAILED(rv)
                         || leafName.Length() < sizeof(".dSYM")
-                        || PL_strcasecmp(leafName.get() + (leafName.Length() - sizeof(".dSYM") + 1), ".dSYM"))
+                        || RTStrICmp(leafName.get() + (leafName.Length() - sizeof(".dSYM") + 1), ".dSYM"))
 #endif
                         rv = RegisterComponentsInDir(when, dirEntry);
@@ -573 +574 @@
     size_t cchLeafName = strLeafName.Length();
     if (   cchLeafName <= sizeof(s_szSuff)
-        || PL_strcasecmp(strLeafName.get() + cchLeafName - sizeof(s_szSuff) + 1, s_szSuff))
+        || RTStrICmp(strLeafName.get() + cchLeafName - sizeof(s_szSuff) + 1, s_szSuff))
     {
         Log(("Skipping '%s'...", strLeafName.get()));
@@ -580 +581 @@
 #ifndef VBOX_IN_32_ON_64_MAIN_API
     if (   cchLeafName >= sizeof(s_szSuffInvalid)
-        && !PL_strcasecmp(strLeafName.get() + cchLeafName - sizeof(s_szSuffInvalid) + 1, s_szSuffInvalid))
+        && !RTStrICmp(strLeafName.get() + cchLeafName - sizeof(s_szSuffInvalid) + 1, s_szSuffInvalid))
     {
         Log(("Skipping '%s' (#2)...", strLeafName.get()));

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

@@ -45 +45 @@
 #include <ctype.h>
 #include "nsMemory.h"
-#include "plstr.h"
 #include "nscore.h"
 #include "prtypes.h"
@@ -145 +144 @@
     return PRUint32(::strlen(s));                                               
   }                                                                             
-
-  /// Case-insensitive string comparison.
-  static PRInt32 strcasecmp(const char* s1, const char* s2) {
-    return PRInt32(PL_strcasecmp(s1, s2));
-  }
-
-  /// Case-insensitive string comparison with length
-  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
-    PRInt32 result=PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
-    //Egads. PL_strncasecmp is returning *very* negative numbers.
-    //Some folks expect -1,0,1, so let's temper its enthusiasm.
-    if (result<0) 
-      result=-1;
-    return result;
-  }
   
   static char* strdup(const char* str) {

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiMisc.cpp

@@ -68 +68 @@
     for(const xptiFileTypeEntry* p = g_Entries; p->name; p++)
     {
-        if(len > p->len && 0 == PL_strcasecmp(p->name, &(name[len - p->len])))
+        if(len > p->len && 0 == RTStrICmp(p->name, &(name[len - p->len])))
             return p->type;
     }

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiprivate.h

@@ -79 +79 @@
 
 #include "pldhash.h"
-#include "plstr.h"
 #include "prtime.h"
 

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);

trunk/src/libs/xpcom18a4/xpcom/tests/TestCRT.cpp

@@ -39 +39 @@
 #include "nsCRT.h"
 #include "nsString.h"
-#include "plstr.h"
 #include <stdlib.h>
 
@@ -63 +62 @@
   PRIntn clib = RTStrCmp(s1, s2);
   PRIntn clib_n = RTStrNCmp(s1, s2, n);
-  PRIntn clib_case = PL_strcasecmp(s1, s2);
-  PRIntn clib_case_n = PL_strncasecmp(s1, s2, n);
 
   nsAutoString t1,t2;