Changeset 103458 in vbox

Timestamp:

Feb 19, 2024 5:00:08 PM (9 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove some unused stuff, bugref:3409

Location:

trunk/src/libs/xpcom18a4

Files:

• nsprpub/pr/src/pthreads/ptsynch.c (modified) (1 diff)
• xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp (modified) (3 diffs)
• xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp (modified) (1 diff)
• xpcom/tests/TestCRT.cpp (modified) (2 diffs)
• xpcom/tests/nsIFileTest.cpp (modified) (6 diffs)
• xpcom/typelib/xpidl/xpidl_header.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c

@@ -410 +410 @@
 }  /* PR_WaitCondVar */
 
-static PRStatus PR_NotifyCondVar(PRCondVar *cvar)
-{
-    Assert(cvar != NULL);   
-    pt_PostNotifyToCvar(cvar, PR_FALSE);
-    return PR_SUCCESS;
-}  /* PR_NotifyCondVar */
-
-static PRStatus PR_NotifyAllCondVar(PRCondVar *cvar)
-{
-    Assert(cvar != NULL);
-    pt_PostNotifyToCvar(cvar, PR_TRUE);
-    return PR_SUCCESS;
-}  /* PR_NotifyAllCondVar */
-
 /**************************************************************/
 /**************************************************************/

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp

@@ -49 +49 @@
 static int DoMultipleInheritenceTest(int rcExit);
 static int DoMultipleInheritenceTest2(int rcExit);
+#if 0 /*unused*/
 static void DoSpeedTest();
+#endif
 
 
@@ -1413 +1415 @@
 }
 
+#if 0 /*unused*/
 static void DoSpeedTest()
 {
@@ -1464 +1467 @@
             (double)(interval_invoke-interval_direct)/(double)interval_invoke*100);
 }
+#endif

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

@@ -1812 +1812 @@
 }
 
-#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
-{
-    nsISupportsArray* array;
-    const char*       prefix;
-    PRUint32          length;
-};
-
-PR_STATIC_CALLBACK(PLDHashOperator)
-xpti_ArrayPrefixAppender(PLDHashTable *table, PLDHashEntryHdr *hdr,
-                         PRUint32 number, void *arg)
-{
-    xptiInterfaceEntry* entry = ((xptiHashEntry*)hdr)->value;
-    ArrayAndPrefix* args = (ArrayAndPrefix*) arg;
-
-    const char* name = entry->GetTheName();
-    if(name != PL_strnstr(name, args->prefix, args->length))
-        return PL_DHASH_NEXT;
-
-    nsCOMPtr<nsIInterfaceInfo> ii;
-    if(NS_SUCCEEDED(EntryToInfo(entry, getter_AddRefs(ii))))
-        args->array->AppendElement(ii);
-    return PL_DHASH_NEXT;
-}
-
 /* void autoRegisterInterfaces (); */
 NS_IMETHODIMP xptiInterfaceInfoManager::AutoRegisterInterfaces()

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

@@ -41 +41 @@
 #include <stdlib.h>
 
+#ifdef DEBUG
 // The return from strcmp etc is only defined to be postive, zero or
 // negative. The magnitude of a non-zero return is irrelevant.
@@ -53 +54 @@
     }
 }
-
+#endif
 
 // Verify that nsCRT versions of string comparison routines get the

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

@@ -15 +15 @@
 #include "nsCOMPtr.h"
 
-static void Passed();
 static void Failed(const char* explanation = nsnull);
-static void Inspect();
 static void Banner(const char* bannerString);
 
@@ -38 +36 @@
 
 //----------------------------------------------------------------------------
-static void Passed()
-//----------------------------------------------------------------------------
-{
-    printf("Test passed.");
-}
-
-//----------------------------------------------------------------------------
 static void Failed(const char* explanation)
 //----------------------------------------------------------------------------
@@ -50 +41 @@
     printf("ERROR : Test failed.\n");
     printf("REASON: %s.\n", explanation);
-}
-
-//----------------------------------------------------------------------------
-static void Inspect()
-//----------------------------------------------------------------------------
-{
-    printf("^^^^^^^^^^ PLEASE INSPECT OUTPUT FOR ERRORS\n");
 }
 
@@ -171 +155 @@
 
 }
-
-static void CreateUniqueTest(const char* creationPath, const char* appendPath,
-                             PRInt32 whatToCreate, PRInt32 perm)
-{
-    nsresult rv;
-    nsCOMPtr<nsILocalFile> file =
-        do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
-
-    if (NS_FAILED(rv) || (!file))
-    {
-        printf("create nsILocalFile failed\n");
-        return;
-    }
-
-    Banner("Creation Test");
-    printf("creationPath == %s\nappendPath == %s\n", creationPath, appendPath);
-
-    rv = file->InitWithNativePath(nsDependentCString(creationPath));
-    VerifyResult(rv);
-
-    printf("Appending %s\n", appendPath);
-    rv = file->AppendNative(nsDependentCString(appendPath));
-    VerifyResult(rv);
-
-    printf("Check For Existence\n");
-
-    PRBool exists;
-    file->Exists(&exists);
-
-    if (exists)
-        printf("Yup!\n");
-    else
-        printf("no.\n");
-
-
-    rv = file->CreateUnique(whatToCreate, perm);
-    VerifyResult(rv);
-
-    rv = file->Exists(&exists);
-    VerifyResult(rv);
-
-
-    if (!exists)
-    {
-        Failed("Did not create file system object!");
-        return;
-    }
-
-}
-
 
 static void CopyTest(const char *testFile, const char *targetDir)
@@ -423 +357 @@
     registrar->AutoRegister(nsnull);
 
-#if defined(XP_WIN) || defined(XP_OS2)
-    InitTest("c:\\temp\\", "sub1/sub2/"); // expect failure
-    InitTest("d:\\temp\\", "sub1\\sub2\\"); // expect failure
-
-    CreationTest("c:\\temp\\", "file.txt", nsIFile::NORMAL_FILE_TYPE, 0644);
-    DeletionTest("c:\\temp\\", "file.txt", PR_FALSE);
-
-    MoveTest("c:\\newtemp\\", "d:");
-
-    CreationTest("c:\\temp\\", "mumble\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\", nsIFile::DIRECTORY_TYPE, 0644);
-    DeletionTest("c:\\temp\\", "mumble", PR_TRUE);
-
-    CreateUniqueTest("c:\\temp\\", "foo", nsIFile::NORMAL_FILE_TYPE, 0644);
-    CreateUniqueTest("c:\\temp\\", "foo", nsIFile::NORMAL_FILE_TYPE, 0644);
-    CreateUniqueTest("c:\\temp\\", "bar.xx", nsIFile::DIRECTORY_TYPE, 0644);
-    CreateUniqueTest("c:\\temp\\", "bar.xx", nsIFile::DIRECTORY_TYPE, 0644);
-    DeletionTest("c:\\temp\\", "foo", PR_TRUE);
-    DeletionTest("c:\\temp\\", "foo-1", PR_TRUE);
-    DeletionTest("c:\\temp\\", "bar.xx", PR_TRUE);
-    DeletionTest("c:\\temp\\", "bar-1.xx", PR_TRUE);
-
-#else
-#ifdef XP_UNIX
     InitTest("/tmp/", "sub1/sub2/"); // expect failure
 
@@ -465 +376 @@
     DeletionTest("/tmp", "foo", PR_TRUE);
 
-#endif /* XP_UNIX */
-#endif /* XP_WIN || XP_OS2 */
     return 0;
 }

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_header.c

@@ -281 +281 @@
     fputs("#define NS_DECL_", state->file);
     classNameUpper = xpidl_strdup(className);
+    if (!classNameUpper)
+        FAIL;
+
     for (cp = classNameUpper; *cp != '\0'; cp++)
         *cp = toupper(*cp);