From cb45a9e50a24a8a02a3543e91cc3f8dfde0ca331 Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Mon, 13 Jan 2003 06:08:00 +0000 Subject: [PATCH] remove unused xcDllStore (bug 187876). r=dougt, rs=brendan. git-svn-id: svn://10.0.0.236/trunk@136225 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/components/xcDllStore.cpp | 107 ------------------------ mozilla/xpcom/components/xcDllStore.h | 68 --------------- mozilla/xpcom/macbuild/xpcomPPC.xml | 30 ------- 3 files changed, 205 deletions(-) delete mode 100644 mozilla/xpcom/components/xcDllStore.cpp delete mode 100644 mozilla/xpcom/components/xcDllStore.h diff --git a/mozilla/xpcom/components/xcDllStore.cpp b/mozilla/xpcom/components/xcDllStore.cpp deleted file mode 100644 index 726f143a285..00000000000 --- a/mozilla/xpcom/components/xcDllStore.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* THIS FILE IS OBSOLETE */ - -/* nsDllStore - * - * Stores dll and their accociated info in a hash keyed on the system format - * full dll path name e.g C:\Program Files\Netscape\Program\raptor.dll - * - * NOTE: dll names are considered to be case sensitive. - */ - -#include "xcDllStore.h" - -static PR_CALLBACK PRIntn _deleteDllInfo(PLHashEntry *he, PRIntn i, void *arg) -{ - delete (nsDll *)he->value; - return (HT_ENUMERATE_NEXT); -} - -nsDllStore::nsDllStore(void) : m_dllHashTable(NULL) -{ - PRUint32 initSize = 128; - - m_dllHashTable = PL_NewHashTable(initSize, PL_HashString, - PL_CompareStrings, PL_CompareValues, NULL, NULL); -} - - -nsDllStore::~nsDllStore(void) -{ - if (m_dllHashTable) - { - // Delete each of the nsDll stored before deleting the Hash Table - PL_HashTableEnumerateEntries(m_dllHashTable, _deleteDllInfo, NULL); - PL_HashTableDestroy(m_dllHashTable); - } - m_dllHashTable = NULL; -} - - -nsDll* nsDllStore::Get(const char *dll) -{ - nsDll *dllInfo = NULL; - if (m_dllHashTable) - { - dllInfo = (nsDll *)PL_HashTableLookup(m_dllHashTable, dll); - } - return (dllInfo); -} - - -nsDll* nsDllStore::Remove(const char *dll) -{ - if (m_dllHashTable == NULL) - { - return (NULL); - } - nsDll *dllInfo = Get(dll); - PL_HashTableRemove(m_dllHashTable, dll); - return (dllInfo); -} - -PRBool nsDllStore::Put(const char *dll, nsDll *dllInfo) -{ - if (m_dllHashTable == NULL) - return(PR_FALSE); - - PLHashEntry *entry = - PL_HashTableAdd(m_dllHashTable, (void *)dll, (void *)dllInfo); - return ((entry != NULL) ? PR_TRUE : PR_FALSE); -} diff --git a/mozilla/xpcom/components/xcDllStore.h b/mozilla/xpcom/components/xcDllStore.h deleted file mode 100644 index 69e20c15028..00000000000 --- a/mozilla/xpcom/components/xcDllStore.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -/* nsDllStore - * - * Stores dll and their accociated info in a hash keyed on the system format - * full dll path name e.g C:\Program Files\Netscape\Program\raptor.dll - * - * NOTE: dll names are considered to be case sensitive. - */ - -#include "plhash.h" -#include "xcDll.h" - -class nsDllStore -{ -private: - PLHashTable *m_dllHashTable; - -public: - // Constructor - nsDllStore(void); - ~nsDllStore(void); - - // Caller is not expected to delete nsDll returned - // The nsDll returned in NOT removed from the hash - nsDll* Get(const char *filename); - PRBool Put(const char *filename, nsDll *dllInfo); - - // The nsDll returned is removed from the hash - // Caller is expected to delete the returned nsDll - nsDll* Remove(const char *filename); -}; diff --git a/mozilla/xpcom/macbuild/xpcomPPC.xml b/mozilla/xpcom/macbuild/xpcomPPC.xml index 5cebd8304bd..a5a8ec974e8 100644 --- a/mozilla/xpcom/macbuild/xpcomPPC.xml +++ b/mozilla/xpcom/macbuild/xpcomPPC.xml @@ -1128,13 +1128,6 @@ Text Debug - - Name - xcDllStore.cpp - MacOS - Text - Debug - Name nsSupportsArrayEnumerator.cpp @@ -1996,11 +1989,6 @@ xcDll.cpp MacOS - - Name - xcDllStore.cpp - MacOS - Name nsSupportsArrayEnumerator.cpp @@ -3640,13 +3628,6 @@ Text Debug - - Name - xcDllStore.cpp - MacOS - Text - Debug - Name nsSupportsArrayEnumerator.cpp @@ -4513,11 +4494,6 @@ xcDll.cpp MacOS - - Name - xcDllStore.cpp - MacOS - Name nsSupportsArrayEnumerator.cpp @@ -5228,12 +5204,6 @@ xcDll.cpp MacOS - - xpcom.shlb - Name - xcDllStore.cpp - MacOS - xpcom.shlb Name