Changeset 102211 in vbox for trunk/src/libs

Timestamp:

Nov 21, 2023 2:19:17 PM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160336

Message:

libs/xpcom: Remove now unused code in nsprpub, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/nspr.h (modified) (1 diff)
• nsprpub/pr/include/prinit.h (deleted)
• nsprpub/pr/src/misc/prinit.c (modified) (2 diffs)
• nsprpub/pr/src/pthreads/ptthread.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -169 +169 @@
         nsprpub/pr/include/prclist.h \
         nsprpub/pr/include/prcvar.h \
-        nsprpub/pr/include/prinit.h \
         nsprpub/pr/include/prinrval.h \
         nsprpub/pr/include/prlock.h \

trunk/src/libs/xpcom18a4/nsprpub/pr/include/nspr.h

@@ -42 +42 @@
 #include "prclist.h"
 #include "prcvar.h"
-#include "prinit.h"
 #include "prinrval.h"
 #include "prlock.h"

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -53 +53 @@
 PRBool _pr_initialized = PR_FALSE;
 
-
-PR_IMPLEMENT(PRBool) PR_Initialized(void)
-{
-    return _pr_initialized;
-}
-
 PRInt32 _native_threads_only = 0;
 
@@ -86 +80 @@
 }
 
-PR_IMPLEMENT(void) PR_Init(
-    PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs)
-{
-    _PR_ImplicitInitialization();
-}
-
-PR_IMPLEMENT(PRIntn) PR_Initialize(
-    PRPrimordialFn prmain, PRIntn argc, char **argv, PRUintn maxPTDs)
-{
-    PRIntn rv;
-    _PR_ImplicitInitialization();
-    rv = prmain(argc, argv);
-        PR_Cleanup();
-    return rv;
-}  /* PR_Initialize */
-
 /* prinit.c */
 

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

@@ -233 +233 @@
 }  /* _PR_InitThreads */
 
-PR_IMPLEMENT(PRStatus) PR_Cleanup(void)
-{
-    PRThread *me = PR_GetCurrentThread();
-    Log(("PR_Cleanup: shutting down NSPR\n"));
-    Assert(me->state & PT_THREAD_PRIMORD);
-    if (me->state & PT_THREAD_PRIMORD)
-    {
-        PR_Lock(pt_book.ml);
-        while (pt_book.user > pt_book.this_many)
-            PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT);
-        PR_Unlock(pt_book.ml);
-
-        /*
-         * I am not sure if it's safe to delete the cv and lock here,
-         * since there may still be "system" threads around. If this
-         * call isn't immediately prior to exiting, then there's a
-         * problem.
-         */
-        if (0 == pt_book.system)
-        {
-            PR_DestroyCondVar(pt_book.cv); pt_book.cv = NULL;
-            PR_DestroyLock(pt_book.ml); pt_book.ml = NULL;
-        }
-        _pt_thread_death(me);
-
-        _pr_initialized = PR_FALSE;
-        return PR_SUCCESS;
-    }
-    return PR_FAILURE;
-}  /* PR_Cleanup */
-
 /* ptthread.c */