From 5a199df3fe6b3ce0dc880af0946a18d5b284b655 Mon Sep 17 00:00:00 2001 From: "nelson%bolyard.com" Date: Sun, 5 Oct 2008 20:59:26 +0000 Subject: Bug 450845: Stop exporting symbols that are not present in the .def files Eliminate PR_EXTERN, PR_IMPLEMENT in nss/lib, r=wtc --- security/nss/lib/base/nssbaset.h | 8 ++++---- security/nss/lib/ckfw/capi/staticobj.c | 4 ++-- security/nss/lib/ckfw/nssmkey/staticobj.c | 4 ++-- security/nss/lib/softoken/pkcs11t.h | 6 +++--- security/nss/lib/util/nssb64d.c | 2 +- security/nss/lib/util/nssrwlk.c | 14 +++++++------- security/nss/lib/util/nssrwlk.h | 16 ++++++++-------- security/nss/lib/util/secport.h | 4 ++-- security/nss/lib/util/utf8.c | 4 ++-- 9 files changed, 31 insertions(+), 31 deletions(-) (limited to 'security/nss/lib') diff --git a/security/nss/lib/base/nssbaset.h b/security/nss/lib/base/nssbaset.h index be60c8335..6c3c485be 100644 --- a/security/nss/lib/base/nssbaset.h +++ b/security/nss/lib/base/nssbaset.h @@ -61,10 +61,10 @@ static const char NSSBASET_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$"; */ #define DUMMY /* dummy */ -#define NSS_EXTERN PR_EXTERN(DUMMY) -#define NSS_IMPLEMENT PR_IMPLEMENT(DUMMY) -#define NSS_EXTERN_DATA PR_EXTERN_DATA(DUMMY) -#define NSS_IMPLEMENT_DATA PR_IMPLEMENT_DATA(DUMMY) +#define NSS_EXTERN extern +#define NSS_EXTERN_DATA extern +#define NSS_IMPLEMENT +#define NSS_IMPLEMENT_DATA PR_BEGIN_EXTERN_C diff --git a/security/nss/lib/ckfw/capi/staticobj.c b/security/nss/lib/ckfw/capi/staticobj.c index 8cfd8fbdd..19ff37617 100644 --- a/security/nss/lib/ckfw/capi/staticobj.c +++ b/security/nss/lib/ckfw/capi/staticobj.c @@ -67,8 +67,8 @@ static const NSSItem nss_ckcapi_items_1 [] = { { (void *)"Mozilla CAPI Access", (PRUint32)20 } }; -PR_IMPLEMENT_DATA(ckcapiInternalObject) nss_ckcapi_data[] = { +ckcapiInternalObject nss_ckcapi_data[] = { { ckcapiRaw, { 5, nss_ckcapi_types_1, nss_ckcapi_items_1} , {NULL} }, }; -PR_IMPLEMENT_DATA(const PRUint32) nss_ckcapi_nObjects = 1; +const PRUint32 nss_ckcapi_nObjects = 1; diff --git a/security/nss/lib/ckfw/nssmkey/staticobj.c b/security/nss/lib/ckfw/nssmkey/staticobj.c index 982911895..ad9f1dff6 100644 --- a/security/nss/lib/ckfw/nssmkey/staticobj.c +++ b/security/nss/lib/ckfw/nssmkey/staticobj.c @@ -67,8 +67,8 @@ static const NSSItem nss_ckmk_items_1 [] = { { (void *)"Mozilla Mac Key Ring Access", (PRUint32)28 } }; -PR_IMPLEMENT_DATA(ckmkInternalObject) nss_ckmk_data[] = { +ckmkInternalObject nss_ckmk_data[] = { { ckmkRaw, {{ 5, nss_ckmk_types_1, nss_ckmk_items_1}} , CKO_DATA, {NULL} }, }; -PR_IMPLEMENT_DATA(const PRUint32) nss_ckmk_nObjects = 1; +const PRUint32 nss_ckmk_nObjects = 1; diff --git a/security/nss/lib/softoken/pkcs11t.h b/security/nss/lib/softoken/pkcs11t.h index a828743c3..104fa698a 100644 --- a/security/nss/lib/softoken/pkcs11t.h +++ b/security/nss/lib/softoken/pkcs11t.h @@ -60,9 +60,9 @@ #define CK_PTR * #define CK_NULL_PTR 0 -#define CK_CALLBACK_FUNCTION(rv,func) rv (PR_CALLBACK * func) -#define CK_DECLARE_FUNCTION(rv,func) PR_EXTERN(rv) func -#define CK_DECLARE_FUNCTION_POINTER(rv,func) rv (PR_CALLBACK * func) +#define CK_CALLBACK_FUNCTION(rtype,func) rtype (PR_CALLBACK * func) +#define CK_DECLARE_FUNCTION(rtype,func) extern rtype func +#define CK_DECLARE_FUNCTION_POINTER(rtype,func) rtype (PR_CALLBACK * func) #define CK_INVALID_SESSION 0 diff --git a/security/nss/lib/util/nssb64d.c b/security/nss/lib/util/nssb64d.c index 2168d01bd..42b1ca684 100644 --- a/security/nss/lib/util/nssb64d.c +++ b/security/nss/lib/util/nssb64d.c @@ -53,7 +53,7 @@ * - giving everything names that are accepted by the NSPR module owners * (though I tried to choose ones that would work without modification) * - exporting the functions (remove static declarations and add - * PR_IMPLEMENT as necessary) + * to nssutil.def as necessary) * - put prototypes into appropriate header file (probably replacing * the entire current lib/libc/include/plbase64.h in NSPR) * along with a typedef for the context structure (which should be diff --git a/security/nss/lib/util/nssrwlk.c b/security/nss/lib/util/nssrwlk.c index 1eafde163..c46e36617 100644 --- a/security/nss/lib/util/nssrwlk.c +++ b/security/nss/lib/util/nssrwlk.c @@ -101,7 +101,7 @@ static void nssRWLock_ReleaseLockStack(void *lock_stack); * */ -PR_IMPLEMENT(NSSRWLock *) +NSSRWLock * NSSRWLock_New(PRUint32 lock_rank, const char *lock_name) { NSSRWLock *rwlock; @@ -147,7 +147,7 @@ loser: /* ** Destroy the given RWLock "lock". */ -PR_IMPLEMENT(void) +void NSSRWLock_Destroy(NSSRWLock *rwlock) { PR_ASSERT(rwlock != NULL); @@ -169,7 +169,7 @@ NSSRWLock_Destroy(NSSRWLock *rwlock) /* ** Read-lock the RWLock. */ -PR_IMPLEMENT(void) +void NSSRWLock_LockRead(NSSRWLock *rwlock) { PRThread *me = PR_GetCurrentThread(); @@ -207,7 +207,7 @@ NSSRWLock_LockRead(NSSRWLock *rwlock) /* Unlock a Read lock held on this RW lock. */ -PR_IMPLEMENT(void) +void NSSRWLock_UnlockRead(NSSRWLock *rwlock) { PZ_Lock(rwlock->rw_lock); @@ -236,7 +236,7 @@ NSSRWLock_UnlockRead(NSSRWLock *rwlock) /* ** Write-lock the RWLock. */ -PR_IMPLEMENT(void) +void NSSRWLock_LockWrite(NSSRWLock *rwlock) { PRThread *me = PR_GetCurrentThread(); @@ -286,7 +286,7 @@ NSSRWLock_LockWrite(NSSRWLock *rwlock) /* Unlock a Read lock held on this RW lock. */ -PR_IMPLEMENT(void) +void NSSRWLock_UnlockWrite(NSSRWLock *rwlock) { PRThread *me = PR_GetCurrentThread(); @@ -321,7 +321,7 @@ NSSRWLock_UnlockWrite(NSSRWLock *rwlock) } /* This is primarily for debugging, i.e. for inclusion in ASSERT calls. */ -PR_IMPLEMENT(PRBool) +PRBool NSSRWLock_HaveWriteLock(NSSRWLock *rwlock) { PRBool ownWriteLock; PRThread *me = PR_GetCurrentThread(); diff --git a/security/nss/lib/util/nssrwlk.h b/security/nss/lib/util/nssrwlk.h index 822411b7f..914bf3a8a 100644 --- a/security/nss/lib/util/nssrwlk.h +++ b/security/nss/lib/util/nssrwlk.h @@ -74,7 +74,7 @@ PR_BEGIN_EXTERN_C ** is returned. ** ***********************************************************************/ -PR_EXTERN(NSSRWLock*) NSSRWLock_New(PRUint32 lock_rank, const char *lock_name); +extern NSSRWLock* NSSRWLock_New(PRUint32 lock_rank, const char *lock_name); /*********************************************************************** ** FUNCTION: NSSRWLock_AtomicCreate @@ -92,7 +92,7 @@ PR_EXTERN(NSSRWLock*) NSSRWLock_New(PRUint32 lock_rank, const char *lock_name); ** the pointer will be left NULL. ** ***********************************************************************/ -PR_EXTERN(NSSRWLock *) +extern NSSRWLock * nssRWLock_AtomicCreate( NSSRWLock ** prwlock, PRUint32 lock_rank, const char * lock_name); @@ -105,7 +105,7 @@ nssRWLock_AtomicCreate( NSSRWLock ** prwlock, ** OUTPUTS: void ** RETURN: None ***********************************************************************/ -PR_EXTERN(void) NSSRWLock_Destroy(NSSRWLock *lock); +extern void NSSRWLock_Destroy(NSSRWLock *lock); /*********************************************************************** ** FUNCTION: NSSRWLock_LockRead @@ -115,7 +115,7 @@ PR_EXTERN(void) NSSRWLock_Destroy(NSSRWLock *lock); ** OUTPUTS: void ** RETURN: None ***********************************************************************/ -PR_EXTERN(void) NSSRWLock_LockRead(NSSRWLock *lock); +extern void NSSRWLock_LockRead(NSSRWLock *lock); /*********************************************************************** ** FUNCTION: NSSRWLock_LockWrite @@ -125,7 +125,7 @@ PR_EXTERN(void) NSSRWLock_LockRead(NSSRWLock *lock); ** OUTPUTS: void ** RETURN: None ***********************************************************************/ -PR_EXTERN(void) NSSRWLock_LockWrite(NSSRWLock *lock); +extern void NSSRWLock_LockWrite(NSSRWLock *lock); /*********************************************************************** ** FUNCTION: NSSRWLock_UnlockRead @@ -135,7 +135,7 @@ PR_EXTERN(void) NSSRWLock_LockWrite(NSSRWLock *lock); ** OUTPUTS: void ** RETURN: void ***********************************************************************/ -PR_EXTERN(void) NSSRWLock_UnlockRead(NSSRWLock *lock); +extern void NSSRWLock_UnlockRead(NSSRWLock *lock); /*********************************************************************** ** FUNCTION: NSSRWLock_UnlockWrite @@ -145,7 +145,7 @@ PR_EXTERN(void) NSSRWLock_UnlockRead(NSSRWLock *lock); ** OUTPUTS: void ** RETURN: void ***********************************************************************/ -PR_EXTERN(void) NSSRWLock_UnlockWrite(NSSRWLock *lock); +extern void NSSRWLock_UnlockWrite(NSSRWLock *lock); /*********************************************************************** ** FUNCTION: NSSRWLock_HaveWriteLock @@ -156,7 +156,7 @@ PR_EXTERN(void) NSSRWLock_UnlockWrite(NSSRWLock *lock); ** RETURN: PRBool PR_TRUE IFF the current thread holds the write lock. ***********************************************************************/ -PR_EXTERN(PRBool) NSSRWLock_HaveWriteLock(NSSRWLock *rwlock); +extern PRBool NSSRWLock_HaveWriteLock(NSSRWLock *rwlock); /* SEC_END_PROTOS */ PR_END_EXTERN_C diff --git a/security/nss/lib/util/secport.h b/security/nss/lib/util/secport.h index 90a0fd499..923c09b0f 100644 --- a/security/nss/lib/util/secport.h +++ b/security/nss/lib/util/secport.h @@ -213,7 +213,7 @@ PRBool PORT_ISO88591_UTF8Conversion(const unsigned char *inBuf, unsigned int inBufLen, unsigned char *outBuf, unsigned int maxOutBufLen, unsigned int *outBufLen); -PR_EXTERN(PRBool) +extern PRBool sec_port_ucs4_utf8_conversion_function ( PRBool toUnicode, @@ -224,7 +224,7 @@ sec_port_ucs4_utf8_conversion_function unsigned int *outBufLen ); -PR_EXTERN(PRBool) +extern PRBool sec_port_ucs2_utf8_conversion_function ( PRBool toUnicode, diff --git a/security/nss/lib/util/utf8.c b/security/nss/lib/util/utf8.c index b47a172d1..a50eee923 100644 --- a/security/nss/lib/util/utf8.c +++ b/security/nss/lib/util/utf8.c @@ -163,7 +163,7 @@ sec_port_read_utf8(unsigned int *index, unsigned char *inBuf, unsigned int inBuf return result; } -PR_IMPLEMENT(PRBool) +PRBool sec_port_ucs4_utf8_conversion_function ( PRBool toUnicode, @@ -287,7 +287,7 @@ sec_port_ucs4_utf8_conversion_function } } -PR_IMPLEMENT(PRBool) +PRBool sec_port_ucs2_utf8_conversion_function ( PRBool toUnicode, -- cgit v1.2.1