From b76949a7d264fc87da23326df413fef3540ef89c Mon Sep 17 00:00:00 2001 From: "wtchang%redhat.com" Date: Mon, 19 Dec 2005 17:53:28 +0000 Subject: [PATCH] Bugzilla Bug 317052: removed the obsolete file lib/base/whatnspr.c from CVS. r=relyea. Modified Files: base.h error.c manifest.mn Removed Files: whatnspr.c git-svn-id: svn://10.0.0.236/trunk@186275 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/base/base.h | 39 +---- mozilla/security/nss/lib/base/error.c | 9 +- mozilla/security/nss/lib/base/manifest.mn | 3 +- mozilla/security/nss/lib/base/whatnspr.c | 174 ---------------------- 4 files changed, 6 insertions(+), 219 deletions(-) delete mode 100644 mozilla/security/nss/lib/base/whatnspr.c diff --git a/mozilla/security/nss/lib/base/base.h b/mozilla/security/nss/lib/base/base.h index a7cbccbb2a2..a565b2c20ae 100644 --- a/mozilla/security/nss/lib/base/base.h +++ b/mozilla/security/nss/lib/base/base.h @@ -38,7 +38,7 @@ #define BASE_H #ifdef DEBUG -static const char BASE_CVS_ID[] = "@(#) $RCSfile: base.h,v $ $Revision: 1.17 $ $Date: 2005-01-20 02:25:45 $"; +static const char BASE_CVS_ID[] = "@(#) $RCSfile: base.h,v $ $Revision: 1.18 $ $Date: 2005-12-19 17:53:28 $"; #endif /* DEBUG */ /* @@ -57,7 +57,6 @@ static const char BASE_CVS_ID[] = "@(#) $RCSfile: base.h,v $ $Revision: 1.17 $ $ #endif /* NSSBASE_H */ #include "plhash.h" -#include "prthread.h" PR_BEGIN_EXTERN_C @@ -1407,42 +1406,6 @@ extern const NSSError NSS_ERROR_INVALID_POINTER; #define nsslibc_offsetof(str, memb) ((PRPtrdiff)(&(((str *)0)->memb))) -/* - * nss_NewThreadPrivateIndex - * - */ - -NSS_EXTERN PRStatus -nss_NewThreadPrivateIndex -( - PRUintn *ip, - PRThreadPrivateDTOR dtor -); - -/* - * nss_GetThreadPrivate - * - */ - -NSS_EXTERN void * -nss_GetThreadPrivate -( - PRUintn i -); - -/* - * nss_SetThreadPrivate - * - */ - -NSS_EXTERN void -nss_SetThreadPrivate -( - PRUintn i, - void *v -); - - PR_END_EXTERN_C #endif /* BASE_H */ diff --git a/mozilla/security/nss/lib/base/error.c b/mozilla/security/nss/lib/base/error.c index f6208b57153..e5036ad5021 100644 --- a/mozilla/security/nss/lib/base/error.c +++ b/mozilla/security/nss/lib/base/error.c @@ -35,7 +35,7 @@ * ***** END LICENSE BLOCK ***** */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: error.c,v $ $Revision: 1.6 $ $Date: 2005-01-20 02:25:45 $"; +static const char CVS_ID[] = "@(#) $RCSfile: error.c,v $ $Revision: 1.7 $ $Date: 2005-12-19 17:53:28 $"; #endif /* DEBUG */ /* @@ -96,8 +96,7 @@ static PRCallOnceType error_call_once; static PRStatus error_once_function ( void) { - return nss_NewThreadPrivateIndex(&error_stack_index,PR_Free); - /* return PR_NewThreadPrivateIndex(&error_stack_index, PR_Free); */ + return PR_NewThreadPrivateIndex(&error_stack_index, PR_Free); } /* @@ -124,7 +123,7 @@ error_get_my_stack ( void) } } - rv = (error_stack *)nss_GetThreadPrivate(error_stack_index); + rv = (error_stack *)PR_GetThreadPrivate(error_stack_index); if( (error_stack *)NULL == rv ) { /* Doesn't exist; create one */ new_size = 16; @@ -149,7 +148,7 @@ error_get_my_stack ( void) } /* Set the value, whether or not the allocation worked */ - nss_SetThreadPrivate(error_stack_index, new_stack); + PR_SetThreadPrivate(error_stack_index, new_stack); return new_stack; } diff --git a/mozilla/security/nss/lib/base/manifest.mn b/mozilla/security/nss/lib/base/manifest.mn index 6ee7dd04eae..4e181027058 100644 --- a/mozilla/security/nss/lib/base/manifest.mn +++ b/mozilla/security/nss/lib/base/manifest.mn @@ -34,7 +34,7 @@ # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.8 $ $Date: 2005-01-20 02:25:45 $" +MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.9 $ $Date: 2005-12-19 17:53:28 $" CORE_DEPTH = ../../.. @@ -61,7 +61,6 @@ CSRCS = \ utf8.c \ list.c \ hash.c \ - whatnspr.c \ $(NULL) REQUIRES = nspr diff --git a/mozilla/security/nss/lib/base/whatnspr.c b/mozilla/security/nss/lib/base/whatnspr.c deleted file mode 100644 index ea2ced41fb4..00000000000 --- a/mozilla/security/nss/lib/base/whatnspr.c +++ /dev/null @@ -1,174 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla 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/MPL/ - * - * 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 the Netscape security libraries. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1994-2000 - * 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 MPL, 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 MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: whatnspr.c,v $ $Revision: 1.4 $ $Date: 2005-01-20 02:25:45 $"; -#endif /* DEBUG */ - -#ifndef BASE_H -#include "base.h" -#endif /* BASE_H */ - -/* - * This file isolates us from differences in NSPR versions. - * We have to detect the library with which we're running at - * runtime, and switch behaviours there. This lets us do - * stuff like load cryptoki modules in Communicator. - * - * Hey, it's the PORT layer all over again! - */ - -static int whatnspr = 0; - -static int -set_whatnspr -( - void -) -{ - /* - * The only runtime difference I could find was the - * return value of PR_dtoa. We can't just look for - * a symbol in NSPR >=2, because it'll always be - * found (because we compile against NSPR >=2). - * Maybe we could look for a symbol merely in NSPR 1? - * - */ - - char buffer[64]; - int decpt = 0, sign = 0; - char *rve = (char *)0; - /* extern int PR_dtoa(double, int, int, int *, int *, char **, char *, int); */ - int r = (int)PR_dtoa((double)1.0, 0, 5, &decpt, &sign, &rve, - buffer, sizeof(buffer)); - - switch( r ) { - case 0: - case -1: - whatnspr = 2; - /* - * If we needed to, *now* we could look up "libVersionPoint" - * and get more data there.. except all current NSPR's (up - * to NSPR 4.x at time of writing) still say 2 in their - * version structure. - */ - break; - default: - whatnspr = 1; - break; - } - - return whatnspr; -} - -#define WHATNSPR (whatnspr ? whatnspr : set_whatnspr()) - -NSS_IMPLEMENT PRStatus -nss_NewThreadPrivateIndex -( - PRUintn *ip, - PRThreadPrivateDTOR dtor -) -{ - switch( WHATNSPR ) { - case 1: - { - PRLibrary *l = (PRLibrary *)0; - void *f = PR_FindSymbolAndLibrary("PR_NewThreadPrivateID", &l); - typedef PRInt32 (*ntpt)(void); - ntpt ntp = (ntpt) f; - - PR_ASSERT((void *)0 != f); - - *ip = ntp(); - return PR_SUCCESS; - } - case 2: - default: - return PR_NewThreadPrivateIndex(ip, dtor); - } -} - -NSS_IMPLEMENT void * -nss_GetThreadPrivate -( - PRUintn i -) -{ - switch( WHATNSPR ) { - case 1: - { - PRLibrary *l = (PRLibrary *)0; - void *f = PR_FindSymbolAndLibrary("PR_GetThreadPrivate", &l); - typedef void *(*gtpt)(PRThread *, PRInt32); - gtpt gtp = (gtpt) f; - - PR_ASSERT((void *)0 != f); - - return gtp(PR_CurrentThread(), i); - } - case 2: - default: - return PR_GetThreadPrivate(i); - } -} - -NSS_IMPLEMENT void -nss_SetThreadPrivate -( - PRUintn i, - void *v -) -{ - switch( WHATNSPR ) { - case 1: - { - PRLibrary *l = (PRLibrary *)0; - void *f = PR_FindSymbolAndLibrary("PR_SetThreadPrivate", &l); - typedef PRStatus (*stpt)(PRThread *, PRInt32, void *); - stpt stp = (stpt) f; - - PR_ASSERT((void *)0 != f); - - (void)stp(PR_CurrentThread(), i, v); - return; - } - case 2: - default: - (void)PR_SetThreadPrivate(i, v); - return; - } -}