Changeset 102323 in vbox

Timestamp:

Nov 27, 2023 3:00:21 PM (12 months ago)

Author:

vboxsync

Message:

libs/xpcom: Replace PL_strlen with strlen and get rid of it, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp (modified) (1 diff)
• nsprpub/lib/libc/include/plstr.h (modified) (2 diffs)
• nsprpub/lib/libc/src/strlen.c (deleted)
• xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl (modified) (1 diff)
• xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp (modified) (2 diffs)
• xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp (modified) (1 diff)
• xpcom/reflect/xptinfo/src/xptiMisc.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -387 +387 @@
         nsprpub/lib/ds/plarena.c \
         nsprpub/lib/ds/plhash.c \
-        nsprpub/lib/libc/src/strlen.c \
         nsprpub/lib/libc/src/strcpy.c \
         nsprpub/lib/libc/src/strcmp.c \

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

@@ -194 +194 @@
                               NS_OK,                         // default status
                               (PRUint8 *)joinedQueueName,    // qName gets copied
-                              PL_strlen(joinedQueueName)+1))) { // message length
+                              strlen(joinedQueueName)+1))) { // message length
     // send the attach msg
     SendMessage(&trans, PR_TRUE);  // synchronous

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

@@ -63 +63 @@
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-#define PL_strlen VBoxNsplPL_strlen
 #define PL_strcmp VBoxNsplPL_strcmp
 #define PL_strncmp VBoxNsplPL_strncmp
@@ -75 +74 @@
 #define PL_strcasestr VBoxNsplPL_strcasestr
 #define PL_strndup VBoxNsplPL_strndup
-#define PL_strnlen VBoxNsplPL_strnlen
 #endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C
-/*
- * PL_strlen
- *
- * Returns the length of the provided string, not including the trailing '\0'.
- */
-
-PR_EXTERN(PRUint32)
-PL_strlen(const char *str);
-
-/*
- * PL_strnlen
- *
- * Returns the length of the provided string, not including the trailing '\0',
- * up to the indicated maximum.  The string will not be examined beyond the
- * maximum; if no terminating '\0' is found, the maximum will be returned.
- */
-
-PR_EXTERN(PRUint32)
-PL_strnlen(const char *str, PRUint32 max);
-
 /*
  * PL_strncpy

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl

@@ -57 +57 @@
 
     void autoRegisterInterfaces();
-
-    nsIEnumerator enumerateInterfacesWhoseNamesStartWith(in string prefix);
 };
 

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

@@ -106 +106 @@
                              xptiWorkingSet* aWorkingSet)
 {
-    size_t nameLength = PL_strlen(r.mName);
+    size_t nameLength = strlen(r.mName);
     void* place = XPT_MALLOC(aWorkingSet->GetStructArena(),
                              sizeof(xptiInterfaceEntry) + nameLength);
@@ -259 +259 @@
 {
     // It is not necessary to Resolve because this info is read from manifest.
-    *name = (char*) nsMemory::Clone(mName, PL_strlen(mName)+1);
+    *name = (char*) nsMemory::Clone(mName, strlen(mName)+1);
     return *name ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }

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

@@ -1863 +1863 @@
 }
 
-/* nsIEnumerator enumerateInterfacesWhoseNamesStartWith (in string prefix); */
-NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval)
-{
-    nsCOMPtr<nsISupportsArray> array;
-    NS_NewISupportsArray(getter_AddRefs(array));
-    if(!array)
-        return NS_ERROR_UNEXPECTED;
-
-    ArrayAndPrefix args = {array, prefix, PL_strlen(prefix)};
-    PL_DHashTableEnumerate(mWorkingSet.mNameTable, xpti_ArrayPrefixAppender, &args);
-    
-    return array->Enumerate(_retval);
-}
-
 /* void autoRegisterInterfaces (); */
 NS_IMETHODIMP xptiInterfaceInfoManager::AutoRegisterInterfaces()

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

@@ -42 +42 @@
 #include <iprt/file.h>
 #include <iprt/time.h>
+#include <iprt/string.h>
 
 #include "xptiprivate.h"
@@ -64 +65 @@
 {
     NS_ASSERTION(name, "loser!");
-    int len = PL_strlen(name);
+    int len = strlen(name);
     for(const xptiFileTypeEntry* p = g_Entries; p->name; p++)
     {