Changeset 102174 in vbox for trunk/src/libs

Timestamp:

Nov 21, 2023 8:19:57 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove more unused code, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/lib/libc/include/plstr.h (modified) (2 diffs)
• nsprpub/lib/libc/src/strchr.c (deleted)
• nsprpub/lib/libc/src/strcstr.c (deleted)
• nsprpub/lib/libc/src/strpbrk.c (deleted)
• nsprpub/lib/libc/src/strstr.c (deleted)
• vboxdeps.cpp (modified) (1 diff)
• xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -486 +486 @@
         nsprpub/lib/libc/src/strdup.c \
         nsprpub/lib/libc/src/strcmp.c \
-        nsprpub/lib/libc/src/strccmp.c \
-        nsprpub/lib/libc/src/strchr.c \
-        nsprpub/lib/libc/src/strpbrk.c \
-        nsprpub/lib/libc/src/strstr.c \
-        nsprpub/lib/libc/src/strcstr.c
+        nsprpub/lib/libc/src/strccmp.c
 
 ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # unixish

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

@@ -72 +72 @@
 #define PL_strncpy VBoxNsplPL_strncpy
 #define PL_strncpyz VBoxNsplPL_strncpyz
-#define PL_strrchr VBoxNsplPL_strrchr
 #define PL_strcaserstr VBoxNsplPL_strcaserstr
 #define PL_strcasestr VBoxNsplPL_strcasestr
 #define PL_strndup VBoxNsplPL_strndup
 #define PL_strnlen VBoxNsplPL_strnlen
-#define PL_strnstr VBoxNsplPL_strnstr
-#define PL_strpbrk VBoxNsplPL_strpbrk
-#define PL_strrstr VBoxNsplPL_strrstr
 #endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
@@ -227 +223 @@
 PL_strncasecmp(const char *a, const char *b, PRUint32 max);
 
-/*
- * PL_strrchr
- *
- * Returns a pointer to the last instance of the specified character in the
- * provided string.  It returns null if the character is not found, or if the
- * provided string is null.  The character may be the null character.
- */
-
-PR_EXTERN(char *)
-PL_strrchr(const char *s, char c);
-
-/*
- * NOTE: Looking for strcasechr, strcaserchr, strncasechr, or strncaserchr?
- * Use strpbrk, strprbrk, strnpbrk or strnprbrk.
- */
-
-/*
- * PL_strpbrk
- *
- * Returns a pointer to the first instance in the first string of any character
- * (not including the terminating null character) of the second string.  It returns
- * null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strpbrk(const char *s, const char *list);
-
-/*
- * PL_strrstr
- *
- * Returns a pointer to the last instance of the little string within the big one.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strrstr(const char *big, const char *little);
-
-/*
- * PL_strnstr
- *
- * Returns a pointer to the first instance of the little string within the first
- * n characters of the big one.  It returns null if either string is null.  It
- * returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strnstr(const char *big, const char *little, PRUint32 n);
-
-/*
- * PL_strcasestr
- *
- * Returns a pointer to the first instance of the little string within the big one,
- * ignoring case.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strcasestr(const char *big, const char *little);
-
-/*
- * Things not (yet?) included: strspn/strcspn, strsep.
- * memchr, memcmp, memcpy, memccpy, index, rindex, bcmp, bcopy, bzero.
- * Any and all i18n/l10n stuff.
- */
-
 PR_END_EXTERN_C
 

trunk/src/libs/xpcom18a4/vboxdeps.cpp

@@ -16 +16 @@
 {
     (uintptr_t)PL_strncpy,
-    (uintptr_t)PL_strrchr,
     (uintptr_t)PL_strncpyz,
     (uintptr_t)PL_HashString,

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

@@ -1839 +1839 @@
 }
 
+#ifdef VBOX
+/*
+ * From nsprpub, only caller below.
+ *
+ * @todo r=aeichner Implement an IPRT equivalent and replace.
+ */
+static char *PL_strnstr(const char *big, const char *little, PRUint32 max)
+{
+    size_t ll;
+
+    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
+    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
+
+    ll = strlen(little);
+    if( ll > (size_t)max ) return (char *)0;
+    max -= (PRUint32)ll;
+    max++;
+
+    for( ; max && *big; big++, max-- )
+        if( *little == *big )
+            if( 0 == strncmp(big, little, ll) )
+                return (char *)big;
+
+    return (char *)0;
+}
+#endif
+
 struct ArrayAndPrefix
 {