Bug 557922, Backed out changeset 12f5162b65c9

6 files changed, 2 insertions, 33 deletions

diff --git a/pr/include/private/primpl.h b/pr/include/private/primpl.h
index 7da6e4a6..a817c206 100644
--- a/pr/include/private/primpl.h
+++ b/pr/include/private/primpl.h
@@ -1802,7 +1802,6 @@ extern void _PR_InitDtoa(void);
 extern void _PR_InitTime(void);
 extern void _PR_InitMW(void);
 extern void _PR_InitRWLocks(void);
-extern void _PR_CleanupErrorTables();
 extern void _PR_CleanupThread(PRThread *thread);
 extern void _PR_CleanupCallOnce(void);
 extern void _PR_CleanupMW(void);
diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c
index 0657121f..47154608 100644
--- a/pr/src/linking/prlink.c
+++ b/pr/src/linking/prlink.c
@@ -216,6 +216,8 @@ void _PR_InitLinker(void)
  */
 void _PR_ShutdownLinker(void)
 {
+    /* FIXME: pr_exe_loadmap should be destroyed. */
+    
     PR_DestroyMonitor(pr_linker_lock);
     pr_linker_lock = NULL;
 
@@ -223,9 +225,6 @@ void _PR_ShutdownLinker(void)
         free(_pr_currentLibPath);
         _pr_currentLibPath = NULL;
     }
-
-    free(pr_exe_loadmap->name);
-    PR_FREEIF(pr_exe_loadmap);
 }
 
 /******************************************************************************/
diff --git a/pr/src/misc/prerrortable.c b/pr/src/misc/prerrortable.c
index d2a17c1d..285fde97 100644
--- a/pr/src/misc/prerrortable.c
+++ b/pr/src/misc/prerrortable.c
@@ -181,26 +181,6 @@ PR_ErrorInstallTable(const struct PRErrorTable *table)
     return 0;
 }
 
-void
-_PR_CleanupErrorTables()
-{
-    struct PRErrorTableList *et;
-
-    et = Table_List;
-
-    while (et) {
-        struct PRErrorTableList *next_et;
-
-        next_et = et->next;
-
-        PR_FREEIF(et);
-
-        et = next_et;
-    }
-
-    Table_List = NULL;
-}
-
 PR_IMPLEMENT(void)
 PR_ErrorInstallCallback(const char * const * languages,
 		       PRErrorCallbackLookupFn *lookup, 
diff --git a/pr/src/misc/prinit.c b/pr/src/misc/prinit.c
index 0b667927..43048a0d 100644
--- a/pr/src/misc/prinit.c
+++ b/pr/src/misc/prinit.c
@@ -379,8 +379,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
 
         _PR_MD_EARLY_CLEANUP();
 
-        _PR_CleanupErrorTables();
-
         _PR_CleanupMW();
         _PR_CleanupTime();
         _PR_CleanupDtoa();
diff --git a/pr/src/pthreads/ptthread.c b/pr/src/pthreads/ptthread.c
index 1f29afed..e61a4cbd 100644
--- a/pr/src/pthreads/ptthread.c
+++ b/pr/src/pthreads/ptthread.c
@@ -1095,8 +1095,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup(void)
 
         _PR_MD_EARLY_CLEANUP();
 
-        _PR_CleanupErrorTables();
-
         _PR_CleanupMW();
         _PR_CleanupTime();
         _PR_CleanupDtoa();
@@ -1129,7 +1127,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup(void)
 #ifdef _PR_ZONE_ALLOCATOR
         _PR_DestroyZones();
 #endif
-        _PR_CleanupTPD();
         _pr_initialized = PR_FALSE;
         return PR_SUCCESS;
     }
diff --git a/pr/src/threads/prtpd.c b/pr/src/threads/prtpd.c
index 14859ee3..0eb2a011 100644
--- a/pr/src/threads/prtpd.c
+++ b/pr/src/threads/prtpd.c
@@ -72,10 +72,6 @@ void _PR_InitTPD(void)
 */
 void _PR_CleanupTPD(void)
 {
-    _pr_tpd_length = 0;
-    _pr_tpd_highwater = 0;
-    PR_FREEIF(_pr_tpd_destructors);
-    _pr_tpd_destructors = NULL;
 }  /* _PR_CleanupTPD */
 
 /*