Changeset 102175 in vbox for trunk/src/libs

Timestamp:

Nov 21, 2023 8:29:54 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Replace PL_strdup/PL_strndup/PL_strfree with IPRT equivalents, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp (modified) (3 diffs)
• nsprpub/lib/libc/include/plstr.h (modified) (1 diff)
• nsprpub/lib/libc/src/strdup.c (deleted)
• xpcom/base/nsTraceRefcntImpl.cpp (modified) (3 diffs)
• xpcom/components/nsComponentManager.cpp (modified) (9 diffs)
• xpcom/ds/nsCRT.h (modified) (2 diffs)
• xpcom/proxy/src/nsProxyEvent.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -484 +484 @@
         nsprpub/lib/libc/src/strlen.c \
         nsprpub/lib/libc/src/strcpy.c \
-        nsprpub/lib/libc/src/strdup.c \
         nsprpub/lib/libc/src/strcmp.c \
         nsprpub/lib/libc/src/strccmp.c

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

@@ -36 +36 @@
  * ***** END LICENSE BLOCK ***** */
 
+#include <iprt/string.h>
+
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
@@ -56 +58 @@
 tm_waiting_msg::~tm_waiting_msg() {
   if (domainName)
-    PL_strfree(domainName);
+    RTStrFree(domainName);
 }
 
@@ -69 +71 @@
 tm_queue_mapping::~tm_queue_mapping() {
   if (domainName)
-    PL_strfree(domainName);
+    RTStrFree(domainName);
   if (joinedQueueName)
-    PL_strfree(joinedQueueName);
+    RTStrFree(joinedQueueName);
 }
 

trunk/src/libs/xpcom18a4/nsprpub/lib/libc/include/plstr.h

@@ -136 +136 @@
 
 /*
- * PL_strdup
- *
- * Returns a pointer to a malloc'd extent of memory containing a duplicate
- * of the argument string.  The size of the allocated extent is one greater
- * than the length of the argument string, because of the terminator.  A
- * null argument, like a zero-length argument, will result in a pointer to
- * a one-byte extent containing the null value.  This routine returns null
- * upon malloc failure.
- */
-
-PR_EXTERN(char *)
-PL_strdup(const char *s);
-
-/*
- * PL_strfree
- *
- * Free memory allocated by PL_strdup
- */
-
-PR_EXTERN(void)
-PL_strfree(char *s);
-
-/*
- * PL_strndup
- *
- * Returns a pointer to a malloc'd extent of memory containing a duplicate
- * of the argument string, up to the maximum specified.  If the argument
- * string has a length greater than the value of the specified maximum, the
- * return value will be a pointer to an extent of memory of length one
- * greater than the maximum specified.  A null string, a zero-length string,
- * or a zero maximum will all result in a pointer to a one-byte extent
- * containing the null value.  This routine returns null upon malloc failure.
- */
-
-PR_EXTERN(char *)
-PL_strndup(const char *s, PRUint32 max);
-
-/*
  * PL_strcmp
  *

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

@@ -37 +37 @@
  * ***** END LICENSE BLOCK ***** */
 
+#include <iprt/string.h>
+
 #include "nsTraceRefcntImpl.h"
 #include "nscore.h"
@@ -234 +236 @@
   BloatEntry(const char* className, PRUint32 classSize)
     : mClassSize(classSize) { 
-    mClassName = PL_strdup(className);
+    mClassName = RTStrDup(className);
     Clear(&mNewStats);
     Clear(&mAllStats);
@@ -241 +243 @@
 
   ~BloatEntry() {
-    PL_strfree(mClassName);
+    RTStrFree(mClassName);
   }
 

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

@@ -88 +88 @@
 
 #include <iprt/assert.h>
+#include <iprt/string.h>
 #include <VBox/log.h>
 
@@ -767 +768 @@
 
     mNLoaderData = NS_COMPONENT_TYPE_NATIVE;
-    mLoaderData[mNLoaderData].type = PL_strdup(nativeComponentType);
+    mLoaderData[mNLoaderData].type = RTStrDup(nativeComponentType);
     mLoaderData[mNLoaderData].loader = mNativeComponentLoader;
     NS_ADDREF(mLoaderData[mNLoaderData].loader);
@@ -780 +781 @@
     }
 
-    mLoaderData[mNLoaderData].type = PL_strdup(staticComponentType);
+    mLoaderData[mNLoaderData].type = RTStrDup(staticComponentType);
     mLoaderData[mNLoaderData].loader = mStaticComponentLoader;
     NS_ADDREF(mLoaderData[mNLoaderData].loader);
@@ -874 +875 @@
     for (i=0; i < mNLoaderData; i++) {
         NS_IF_RELEASE(mLoaderData[i].loader);
-        PL_strfree((char *)mLoaderData[i].type);
+        RTStrFree((char *)mLoaderData[i].type);
     }
     PR_Free(mLoaderData);
@@ -949 +950 @@
 AutoRegEntry::~AutoRegEntry()
 {
-    if (mName) PL_strfree(mName);
-    if (mData) PL_strfree(mData);
+    if (mName) RTStrFree(mName);
+    if (mData) RTStrFree(mData);
 }
 
@@ -963 +964 @@
 {
     if (mData)
-        PL_strfree(mData);
+        RTStrFree(mData);
 
     if (!data) {
@@ -970 +971 @@
     }
 
-    mData = PL_strdup(data);
+    mData = RTStrDup(data);
 }
 
@@ -2427 +2428 @@
 
     if (!aSpec) {
-        *aRegistryName = PL_strdup("");
+        *aRegistryName = RTStrDup("");
         return NS_OK;
     }
@@ -2844 +2845 @@
 
     typeIndex = mNLoaderData;
-    mLoaderData[typeIndex].type = PL_strdup(typeStr);
+    mLoaderData[typeIndex].type = RTStrDup(typeStr);
     if (!mLoaderData[typeIndex].type) {
         // mmh! no memory. return failure.

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

@@ -37 +37 @@
 #ifndef nsCRT_h___
 #define nsCRT_h___
+
+#include <iprt/string.h>
 
 #include <stdlib.h>
@@ -170 +172 @@
   
   static char* strdup(const char* str) {
-    return PL_strdup(str);
+    return RTStrDup(str);
   }
 
   static char* strndup(const char* str, PRUint32 len) {
-    return PL_strndup(str, len);
+    return RTStrDupN(str, len);
   }
 
   static void free(char* str) {
-    PL_strfree(str);
+    RTStrFree(str);
   }
 

trunk/src/libs/xpcom18a4/xpcom/proxy/src/nsProxyEvent.cpp

@@ -49 +49 @@
  */
 
+#include <iprt/string.h>
+
 #include "nsProxyEvent.h"
 #include "nsProxyEventPrivate.h"
@@ -177 +179 @@
                     case nsXPTType::T_CHAR_STR:
                         mParameterList[i].val.p =
-                            PL_strdup((const char *)ptr);
+                            RTStrDup((const char *)ptr);
                         break;
                     case nsXPTType::T_WCHAR_STR:
@@ -207 +209 @@
                     case nsXPTType::T_CHAR_STR:
                     case nsXPTType::T_WCHAR_STR:
-                        PL_strfree((char*) ptr);
+                        RTStrFree((char*) ptr);
                         break;
                     case nsXPTType::T_DOMSTRING: