Change the function definitions in dev so that the ctags program will

produce valid tags from these sources.

5 files changed, 153 insertions, 306 deletions

diff --git a/security/nss/lib/dev/ckhelper.c b/security/nss/lib/dev/ckhelper.c
index 60ba7c105..3a6675f57 100644
--- a/security/nss/lib/dev/ckhelper.c
+++ b/security/nss/lib/dev/ckhelper.c
@@ -70,8 +70,7 @@ NSS_IMPLEMENT_DATA const NSSItem
 g_ck_class_privkey = { (CK_VOID_PTR)&s_class_privkey, sizeof(s_class_privkey) };
 
 static PRBool
-is_string_attribute
-(
+is_string_attribute (
   CK_ATTRIBUTE_TYPE aType
 )
 {
@@ -89,8 +88,7 @@ is_string_attribute
 }
 
 NSS_IMPLEMENT PRStatus 
-nssCKObject_GetAttributes
-(
+nssCKObject_GetAttributes (
   CK_OBJECT_HANDLE object,
   CK_ATTRIBUTE_PTR obj_template,
   CK_ULONG count,
@@ -198,8 +196,7 @@ loser:
 }
 
 NSS_IMPLEMENT PRStatus
-nssCKObject_GetAttributeItem
-(
+nssCKObject_GetAttributeItem (
   CK_OBJECT_HANDLE object,
   CK_ATTRIBUTE_TYPE attribute,
   NSSArena *arenaOpt,
@@ -222,8 +219,7 @@ nssCKObject_GetAttributeItem
 }
 
 NSS_IMPLEMENT PRBool
-nssCKObject_IsAttributeTrue
-(
+nssCKObject_IsAttributeTrue (
   CK_OBJECT_HANDLE object,
   CK_ATTRIBUTE_TYPE attribute,
   nssSession *session,
@@ -251,8 +247,7 @@ nssCKObject_IsAttributeTrue
 }
 
 NSS_IMPLEMENT PRStatus 
-nssCKObject_SetAttributes
-(
+nssCKObject_SetAttributes (
   CK_OBJECT_HANDLE object,
   CK_ATTRIBUTE_PTR obj_template,
   CK_ULONG count,
@@ -274,8 +269,7 @@ nssCKObject_SetAttributes
 }
 
 NSS_IMPLEMENT PRBool
-nssCKObject_IsTokenObjectTemplate
-(
+nssCKObject_IsTokenObjectTemplate (
   CK_ATTRIBUTE_PTR objectTemplate, 
   CK_ULONG otsize
 )
@@ -309,8 +303,7 @@ nss_cert_type_from_ck_attrib(CK_ATTRIBUTE_PTR attrib)
 
 /* incoming pointers must be valid */
 NSS_IMPLEMENT PRStatus
-nssCryptokiCertificate_GetAttributes
-(
+nssCryptokiCertificate_GetAttributes (
   nssCryptokiObject *certObject,
   nssSession *sessionOpt,
   NSSArena *arenaOpt,
@@ -412,8 +405,7 @@ nss_key_pair_type_from_ck_attrib(CK_ATTRIBUTE_PTR attrib)
 }
 
 NSS_IMPLEMENT PRStatus
-nssCryptokiPrivateKey_GetAttributes
-(
+nssCryptokiPrivateKey_GetAttributes (
   nssCryptokiObject *keyObject,
   nssSession *sessionOpt,
   NSSArena *arenaOpt,
@@ -466,8 +458,7 @@ nssCryptokiPrivateKey_GetAttributes
 }
 
 NSS_IMPLEMENT PRStatus
-nssCryptokiPublicKey_GetAttributes
-(
+nssCryptokiPublicKey_GetAttributes (
   nssCryptokiObject *keyObject,
   nssSession *sessionOpt,
   NSSArena *arenaOpt,
@@ -521,8 +512,7 @@ nssCryptokiPublicKey_GetAttributes
 #endif /* PURE_STAN_BUILD */
 
 static nssTrustLevel 
-get_nss_trust
-(
+get_nss_trust (
   CK_TRUST ckt
 )
 {
@@ -543,8 +533,7 @@ get_nss_trust
 }
 
 NSS_IMPLEMENT PRStatus
-nssCryptokiTrust_GetAttributes
-(
+nssCryptokiTrust_GetAttributes (
   nssCryptokiObject *trustObject,
   nssSession *sessionOpt,
   NSSItem *sha1_hash,
@@ -600,8 +589,7 @@ nssCryptokiTrust_GetAttributes
 }
 
 NSS_IMPLEMENT PRStatus
-nssCryptokiCRL_GetAttributes
-(
+nssCryptokiCRL_GetAttributes (
   nssCryptokiObject *crlObject,
   nssSession *sessionOpt,
   NSSArena *arenaOpt,
@@ -677,8 +665,7 @@ nssCryptokiCRL_GetAttributes
 }
 
 NSS_IMPLEMENT PRStatus
-nssCryptokiPrivateKey_SetCertificate
-(
+nssCryptokiPrivateKey_SetCertificate (
   nssCryptokiObject *keyObject,
   nssSession *sessionOpt,
   NSSUTF8 *nickname,
diff --git a/security/nss/lib/dev/devmod.c b/security/nss/lib/dev/devmod.c
index e0006370f..7bd0dd404 100644
--- a/security/nss/lib/dev/devmod.c
+++ b/security/nss/lib/dev/devmod.c
@@ -205,8 +205,7 @@ loser:
 }
 
 NSS_IMPLEMENT PRStatus
-nssModule_Load
-(
+nssModule_Load (
   NSSModule *mod
 )
 {
@@ -296,8 +295,7 @@ loser:
 }
 
 NSS_IMPLEMENT PRStatus
-nssModule_Unload
-(
+nssModule_Unload (
   NSSModule *mod
 )
 {
@@ -317,8 +315,7 @@ nssModule_Unload
  *  if provided.  XXX use the opaque arg also, right? 
  */
 NSS_IMPLEMENT NSSModule *
-nssModule_Create
-(
+nssModule_Create (
   NSSUTF8 *moduleOpt,
   NSSUTF8 *uriOpt,
   NSSUTF8 *opaqueOpt,
@@ -367,8 +364,7 @@ loser:
 }
 
 NSS_EXTERN PRStatus
-nssCryptokiArgs_ParseNextPair
-(
+nssCryptokiArgs_ParseNextPair (
   NSSUTF8 *start,
   NSSUTF8 **attrib,
   NSSUTF8 **value,
@@ -377,8 +373,7 @@ nssCryptokiArgs_ParseNextPair
 );
 
 static PRStatus
-parse_slot_flags
-(
+parse_slot_flags (
   NSSSlot *slot,
   NSSUTF8 *slotFlags
 )
@@ -433,8 +428,7 @@ parse_slot_flags
 }
 
 static PRStatus
-parse_slot_parameters
-(
+parse_slot_parameters (
   NSSSlot *slot,
   NSSUTF8 *slotParams,
   NSSArena *tmparena
@@ -473,8 +467,7 @@ get_slot_number(NSSUTF8* snString)
 }
 
 static PRStatus
-parse_module_slot_parameters
-(
+parse_module_slot_parameters (
   NSSModule *mod,
   NSSUTF8 *slotParams
 )
@@ -510,8 +503,7 @@ parse_module_slot_parameters
 }
 
 static PRStatus
-parse_nss_flags
-(
+parse_nss_flags (
   NSSModule *mod,
   NSSUTF8 *nssFlags
 )
@@ -542,8 +534,7 @@ parse_nss_flags
 }
 
 static PRStatus
-parse_nss_parameters
-(
+parse_nss_parameters (
   NSSModule *mod,
   NSSUTF8 *nssParams,
   NSSArena *tmparena,
@@ -580,8 +571,7 @@ parse_nss_parameters
 }
 
 static PRStatus
-parse_module_parameters
-(
+parse_module_parameters (
   NSSModule *mod,
   NSSUTF8 *moduleParams,
   NSSUTF8 **slotParams
@@ -621,8 +611,7 @@ parse_module_parameters
 }
 
 static NSSUTF8 **
-get_module_specs
-(
+get_module_specs (
   NSSModule *mod
 )
 {
@@ -637,8 +626,7 @@ get_module_specs
 
 /* XXX continue working on */
 NSS_IMPLEMENT NSSModule *
-nssModule_CreateFromSpec
-(
+nssModule_CreateFromSpec (
   NSSUTF8 *moduleSpec,
   NSSModule *parent,
   PRBool loadSubModules
@@ -721,8 +709,7 @@ loser:
 }
 
 NSS_IMPLEMENT PRStatus
-nssModule_Destroy
-(
+nssModule_Destroy (
   NSSModule *mod
 )
 {
@@ -743,8 +730,7 @@ nssModule_Destroy
 }
 
 NSS_IMPLEMENT PRStatus
-nssModule_DestroyFromSlot
-(
+nssModule_DestroyFromSlot (
   NSSModule *mod,
   NSSSlot *slot
 )
@@ -766,8 +752,7 @@ nssModule_DestroyFromSlot
 }
 
 NSS_IMPLEMENT NSSModule *
-nssModule_AddRef
-(
+nssModule_AddRef (
   NSSModule *mod
 )
 {
@@ -776,8 +761,7 @@ nssModule_AddRef
 }
 
 NSS_IMPLEMENT NSSUTF8 *
-nssModule_GetName
-(
+nssModule_GetName (
   NSSModule *mod
 )
 {
@@ -785,8 +769,7 @@ nssModule_GetName
 }
 
 NSS_IMPLEMENT PRBool
-nssModule_IsThreadSafe
-(
+nssModule_IsThreadSafe (
   NSSModule *module
 )
 {
@@ -794,8 +777,7 @@ nssModule_IsThreadSafe
 }
 
 NSS_IMPLEMENT PRBool
-nssModule_IsInternal
-(
+nssModule_IsInternal (
   NSSModule *mod
 )
 {
@@ -803,8 +785,7 @@ nssModule_IsInternal
 }
 
 NSS_IMPLEMENT PRBool
-nssModule_IsModuleDBOnly
-(
+nssModule_IsModuleDBOnly (
   NSSModule *mod
 )
 {
@@ -812,8 +793,7 @@ nssModule_IsModuleDBOnly
 }
 
 NSS_IMPLEMENT void *
-nssModule_GetCryptokiEPV
-(
+nssModule_GetCryptokiEPV (
   NSSModule *mod
 )
 {
@@ -821,8 +801,7 @@ nssModule_GetCryptokiEPV
 }
 
 NSS_IMPLEMENT NSSSlot **
-nssModule_GetSlots
-(
+nssModule_GetSlots (
   NSSModule *mod
 )
 {
@@ -838,8 +817,7 @@ nssModule_GetSlots
 }
 
 NSS_IMPLEMENT NSSSlot *
-nssModule_FindSlotByName
-(
+nssModule_FindSlotByName (
   NSSModule *mod,
   NSSUTF8 *slotName
 )
@@ -862,8 +840,7 @@ nssModule_FindSlotByName
 }
 
 NSS_IMPLEMENT NSSToken *
-nssModule_FindTokenByName
-(
+nssModule_FindTokenByName (
   NSSModule *mod,
   NSSUTF8 *tokenName
 )
@@ -888,8 +865,7 @@ nssModule_FindTokenByName
 }
 
 NSS_IMPLEMENT PRInt32
-nssModule_GetCertOrder
-(
+nssModule_GetCertOrder (
   NSSModule *module
 )
 {
diff --git a/security/nss/lib/dev/devslot.c b/security/nss/lib/dev/devslot.c
index 1411fa385..a9df0818d 100644
--- a/security/nss/lib/dev/devslot.c
+++ b/security/nss/lib/dev/devslot.c
@@ -99,8 +99,7 @@ static const CK_FLAGS s_ck_readonly_flags = CKF_SERIAL_SESSION;
 #ifdef PURE_STAN_BUILD
 /* In pk11slot.c, this was a no-op.  So it is here also. */
 static CK_RV PR_CALLBACK
-nss_ck_slot_notify
-(
+nss_ck_slot_notify (
   CK_SESSION_HANDLE session,
   CK_NOTIFICATION event,
   CK_VOID_PTR pData
@@ -110,8 +109,7 @@ nss_ck_slot_notify
 }
 
 NSS_IMPLEMENT NSSSlot *
-nssSlot_Create
-(
+nssSlot_Create (
   CK_SLOT_ID slotID,
   NSSModule *parent
 )
@@ -179,8 +177,7 @@ loser:
 #endif /* PURE_STAN_BUILD */
 
 NSS_IMPLEMENT PRStatus
-nssSlot_Destroy
-(
+nssSlot_Destroy (
   NSSSlot *slot
 )
 {
@@ -215,8 +212,7 @@ nssSlot_ExitMonitor(NSSSlot *slot)
 }
 
 NSS_IMPLEMENT void
-NSSSlot_Destroy
-(
+NSSSlot_Destroy (
   NSSSlot *slot
 )
 {
@@ -224,8 +220,7 @@ NSSSlot_Destroy
 }
 
 NSS_IMPLEMENT NSSSlot *
-nssSlot_AddRef
-(
+nssSlot_AddRef (
   NSSSlot *slot
 )
 {
@@ -234,8 +229,7 @@ nssSlot_AddRef
 }
 
 NSS_IMPLEMENT NSSUTF8 *
-nssSlot_GetName
-(
+nssSlot_GetName (
   NSSSlot *slot
 )
 {
@@ -243,8 +237,7 @@ nssSlot_GetName
 }
 
 NSS_IMPLEMENT NSSUTF8 *
-nssSlot_GetTokenName
-(
+nssSlot_GetTokenName (
   NSSSlot *slot
 )
 {
@@ -269,8 +262,7 @@ within_token_delay_period(NSSSlot *slot)
 }
 
 NSS_IMPLEMENT PRBool
-nssSlot_IsTokenPresent
-(
+nssSlot_IsTokenPresent (
   NSSSlot *slot
 )
 {
@@ -376,8 +368,7 @@ nssSlot_IsTokenPresent
 
 #ifdef PURE_STAN_BUILD
 NSS_IMPLEMENT NSSModule *
-nssSlot_GetModule
-(
+nssSlot_GetModule (
   NSSSlot *slot
 )
 {
@@ -386,8 +377,7 @@ nssSlot_GetModule
 #endif /* PURE_STAN_BUILD */
 
 NSS_IMPLEMENT void *
-nssSlot_GetCryptokiEPV
-(
+nssSlot_GetCryptokiEPV (
   NSSSlot *slot
 )
 {
@@ -399,8 +389,7 @@ nssSlot_GetCryptokiEPV
 }
 
 NSS_IMPLEMENT NSSToken *
-nssSlot_GetToken
-(
+nssSlot_GetToken (
   NSSSlot *slot
 )
 {
@@ -412,8 +401,7 @@ nssSlot_GetToken
 
 #ifdef PURE_STAN_BUILD
 NSS_IMPLEMENT PRBool
-nssSlot_IsPermanent
-(
+nssSlot_IsPermanent (
   NSSSlot *slot
 )
 {
@@ -421,8 +409,7 @@ nssSlot_IsPermanent
 }
 
 NSS_IMPLEMENT PRBool
-nssSlot_IsFriendly
-(
+nssSlot_IsFriendly (
   NSSSlot *slot
 )
 {
@@ -430,8 +417,7 @@ nssSlot_IsFriendly
 }
 
 NSS_IMPLEMENT PRBool
-nssSlot_IsHardware
-(
+nssSlot_IsHardware (
   NSSSlot *slot
 )
 {
@@ -439,8 +425,7 @@ nssSlot_IsHardware
 }
 
 NSS_IMPLEMENT PRStatus
-nssSlot_Refresh
-(
+nssSlot_Refresh (
   NSSSlot *slot
 )
 {
@@ -455,8 +440,7 @@ nssSlot_Refresh
 }
 
 static PRBool
-slot_needs_login
-(
+slot_needs_login (
   NSSSlot *slot,
   nssSession *session
 )
@@ -512,8 +496,7 @@ slot_needs_login
 }
 
 static PRStatus
-slot_login
-(
+slot_login (
   NSSSlot *slot, 
   nssSession *session, 
   CK_USER_TYPE userType, 
@@ -575,8 +558,7 @@ slot_login
 }
 
 static PRStatus
-init_slot_password
-(
+init_slot_password (
   NSSSlot *slot, 
   nssSession *rwSession, 
   NSSUTF8 *password
@@ -616,8 +598,7 @@ loser:
 }
 
 static PRStatus
-change_slot_password
-(
+change_slot_password (
   NSSSlot *slot, 
   nssSession *rwSession, 
   NSSUTF8 *oldPassword,
@@ -658,8 +639,7 @@ change_slot_password
 }
 
 NSS_IMPLEMENT PRStatus
-nssSlot_Login
-(
+nssSlot_Login (
   NSSSlot *slot,
   NSSCallback *pwcb
 )
@@ -698,8 +678,7 @@ nssSlot_Login
 }
 
 NSS_IMPLEMENT PRStatus
-nssSlot_Logout
-(
+nssSlot_Logout (
   NSSSlot *slot,
   nssSession *sessionOpt
 )
@@ -722,8 +701,7 @@ nssSlot_Logout
 }
 
 NSS_IMPLEMENT PRBool
-nssSlot_IsLoggedIn
-(
+nssSlot_IsLoggedIn (
   NSSSlot *slot
 )
 {
@@ -732,8 +710,7 @@ nssSlot_IsLoggedIn
 }
 
 NSS_IMPLEMENT void
-nssSlot_SetPasswordDefaults
-(
+nssSlot_SetPasswordDefaults (
   NSSSlot *slot,
   PRInt32 askPasswordTimeout
 )
@@ -743,8 +720,7 @@ nssSlot_SetPasswordDefaults
 
 
 NSS_IMPLEMENT PRStatus
-nssSlot_SetPassword
-(
+nssSlot_SetPassword (
   NSSSlot *slot,
   NSSUTF8 *oldPasswordOpt,
   NSSUTF8 *newPassword
@@ -772,8 +748,7 @@ nssSlot_SetPassword
 }
 
 NSS_IMPLEMENT nssSession *
-nssSlot_CreateSession
-(
+nssSlot_CreateSession (
   NSSSlot *slot,
   NSSArena *arenaOpt,
   PRBool readWrite /* so far, this is the only flag used */
@@ -824,8 +799,7 @@ nssSlot_CreateSession
 }
 
 NSS_IMPLEMENT PRStatus
-nssSession_Destroy
-(
+nssSession_Destroy (
   nssSession *s
 )
 {
@@ -843,8 +817,7 @@ nssSession_Destroy
 #endif /* PURE_STAN_BUILD */
 
 NSS_IMPLEMENT PRStatus
-nssSession_EnterMonitor
-(
+nssSession_EnterMonitor (
   nssSession *s
 )
 {
@@ -853,8 +826,7 @@ nssSession_EnterMonitor
 }
 
 NSS_IMPLEMENT PRStatus
-nssSession_ExitMonitor
-(
+nssSession_ExitMonitor (
   nssSession *s
 )
 {
@@ -862,8 +834,7 @@ nssSession_ExitMonitor
 }
 
 NSS_EXTERN PRBool
-nssSession_IsReadWrite
-(
+nssSession_IsReadWrite (
   nssSession *s
 )
 {
diff --git a/security/nss/lib/dev/devtoken.c b/security/nss/lib/dev/devtoken.c
index 46624d362..de1613c3d 100644
--- a/security/nss/lib/dev/devtoken.c
+++ b/security/nss/lib/dev/devtoken.c
@@ -69,8 +69,7 @@ struct NSSTokenStr
 };
 
 NSS_IMPLEMENT NSSToken *
-nssToken_Create
-(
+nssToken_Create (
   CK_SLOT_ID slotID,
   NSSSlot *peer
 )
@@ -148,8 +147,7 @@ loser:
 #endif /* PURE_STAN_BUILD */
 
 NSS_IMPLEMENT PRStatus
-nssToken_Destroy
-(
+nssToken_Destroy (
   NSSToken *tok
 )
 {
@@ -165,8 +163,7 @@ nssToken_Destroy
 }
 
 NSS_IMPLEMENT void
-nssToken_Remove
-(
+nssToken_Remove (
   NSSToken *tok
 )
 {
@@ -174,8 +171,7 @@ nssToken_Remove
 }
 
 NSS_IMPLEMENT void
-NSSToken_Destroy
-(
+NSSToken_Destroy (
   NSSToken *tok
 )
 {
@@ -183,8 +179,7 @@ NSSToken_Destroy
 }
 
 NSS_IMPLEMENT NSSToken *
-nssToken_AddRef
-(
+nssToken_AddRef (
   NSSToken *tok
 )
 {
@@ -193,8 +188,7 @@ nssToken_AddRef
 }
 
 NSS_IMPLEMENT NSSSlot *
-nssToken_GetSlot
-(
+nssToken_GetSlot (
   NSSToken *tok
 )
 {
@@ -203,8 +197,7 @@ nssToken_GetSlot
 
 #ifdef PURE_STAN_BUILD
 NSS_IMPLEMENT NSSModule *
-nssToken_GetModule
-(
+nssToken_GetModule (
   NSSToken *token
 )
 {
@@ -213,8 +206,7 @@ nssToken_GetModule
 #endif
 
 NSS_IMPLEMENT void *
-nssToken_GetCryptokiEPV
-(
+nssToken_GetCryptokiEPV (
   NSSToken *token
 )
 {
@@ -222,8 +214,7 @@ nssToken_GetCryptokiEPV
 }
 
 NSS_IMPLEMENT nssSession *
-nssToken_GetDefaultSession
-(
+nssToken_GetDefaultSession (
   NSSToken *token
 )
 {
@@ -231,8 +222,7 @@ nssToken_GetDefaultSession
 }
 
 NSS_IMPLEMENT NSSUTF8 *
-nssToken_GetName
-(
+nssToken_GetName (
   NSSToken *tok
 )
 {
@@ -246,8 +236,7 @@ nssToken_GetName
 }
 
 NSS_IMPLEMENT NSSUTF8 *
-NSSToken_GetName
-(
+NSSToken_GetName (
   NSSToken *token
 )
 {
@@ -255,8 +244,7 @@ NSSToken_GetName
 }
 
 NSS_IMPLEMENT PRBool
-nssToken_IsLoginRequired
-(
+nssToken_IsLoginRequired (
   NSSToken *token
 )
 {
@@ -264,8 +252,7 @@ nssToken_IsLoginRequired
 }
 
 NSS_IMPLEMENT PRBool
-nssToken_NeedsPINInitialization
-(
+nssToken_NeedsPINInitialization (
   NSSToken *token
 )
 {
@@ -273,8 +260,7 @@ nssToken_NeedsPINInitialization
 }
 
 NSS_IMPLEMENT PRStatus
-nssToken_DeleteStoredObject
-(
+nssToken_DeleteStoredObject (
   nssCryptokiObject *instance
 )
 {
@@ -309,8 +295,7 @@ nssToken_DeleteStoredObject
 }
 
 static nssCryptokiObject *
-import_object
-(
+import_object (
   NSSToken *tok,
   nssSession *sessionOpt,
   CK_ATTRIBUTE_PTR objectTemplate,
@@ -357,8 +342,7 @@ import_object
 }
 
 static nssCryptokiObject **
-create_objects_from_handles
-(
+create_objects_from_handles (
   NSSToken *tok,
   nssSession *session,
   CK_OBJECT_HANDLE *handles,
@@ -383,8 +367,7 @@ create_objects_from_handles
 }
 
 static nssCryptokiObject **
-find_objects
-(
+find_objects (
   NSSToken *tok,
   nssSession *sessionOpt,
   CK_ATTRIBUTE_PTR obj_template,
@@ -506,8 +489,7 @@ loser:
 }
 
 static nssCryptokiObject **
-find_objects_by_template
-(
+find_objects_by_template (
   NSSToken *token,
   nssSession *sessionOpt,
   CK_ATTRIBUTE_PTR obj_template,
@@ -558,8 +540,7 @@ find_objects_by_template
 extern const NSSError NSS_ERROR_INVALID_CERTIFICATE;
 
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_ImportCertificate
-(
+nssToken_ImportCertificate (
   NSSToken *tok,
   nssSession *sessionOpt,
   NSSCertificateType certType,
@@ -683,8 +664,7 @@ nssToken_ImportCertificate
  * has been marked as "traversable"
  */
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCertificates
-(
+nssToken_FindCertificates (
   NSSToken *token,
   nssSession *sessionOpt,
   nssTokenSearchType searchType,
@@ -720,8 +700,7 @@ nssToken_FindCertificates
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCertificatesBySubject
-(
+nssToken_FindCertificatesBySubject (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSDER *subject,
@@ -752,8 +731,7 @@ nssToken_FindCertificatesBySubject
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCertificatesByNickname
-(
+nssToken_FindCertificatesByNickname (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSUTF8 *name,
@@ -802,8 +780,7 @@ nssToken_FindCertificatesByNickname
  * it just won't return a value for it.
  */
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCertificatesByEmail
-(
+nssToken_FindCertificatesByEmail (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSASCII7 *email,
@@ -846,8 +823,7 @@ nssToken_FindCertificatesByEmail
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCertificatesByID
-(
+nssToken_FindCertificatesByID (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSItem *id,
@@ -920,8 +896,7 @@ nssToken_decodeSerialItem(NSSItem *serial, NSSItem *serialDecode)
 }
 
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_FindCertificateByIssuerAndSerialNumber
-(
+nssToken_FindCertificateByIssuerAndSerialNumber (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSDER *issuer,
@@ -996,8 +971,7 @@ nssToken_FindCertificateByIssuerAndSerialNumber
 }
 
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_FindCertificateByEncodedCertificate
-(
+nssToken_FindCertificateByEncodedCertificate (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSBER *encodedCertificate,
@@ -1032,8 +1006,7 @@ nssToken_FindCertificateByEncodedCertificate
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindPrivateKeys
-(
+nssToken_FindPrivateKeys (
   NSSToken *token,
   nssSession *sessionOpt,
   nssTokenSearchType searchType,
@@ -1063,8 +1036,7 @@ nssToken_FindPrivateKeys
 
 /* XXX ?there are no session cert objects, so only search token objects */
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_FindPrivateKeyByID
-(
+nssToken_FindPrivateKeyByID (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSItem *keyID
@@ -1094,8 +1066,7 @@ nssToken_FindPrivateKeyByID
 
 /* XXX ?there are no session cert objects, so only search token objects */
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_FindPublicKeyByID
-(
+nssToken_FindPublicKeyByID (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSItem *keyID
@@ -1160,8 +1131,7 @@ md5_hash(NSSItem *input, NSSItem *output)
 }
 
 static CK_TRUST
-get_ck_trust
-(
+get_ck_trust (
   nssTrustLevel nssTrust
 )
 {
@@ -1180,8 +1150,7 @@ get_ck_trust
 }
  
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_ImportTrust
-(
+nssToken_ImportTrust (
   NSSToken *tok,
   nssSession *sessionOpt,
   NSSDER *certEncoding,
@@ -1238,8 +1207,7 @@ nssToken_ImportTrust
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindTrustObjects
-(
+nssToken_FindTrustObjects (
   NSSToken *token,
   nssSession *sessionOpt,
   nssTokenSearchType searchType,
@@ -1277,8 +1245,7 @@ nssToken_FindTrustObjects
 }
 
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_FindTrustForCertificate
-(
+nssToken_FindTrustForCertificate (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSDER *certEncoding,
@@ -1316,8 +1283,7 @@ nssToken_FindTrustForCertificate
 }
  
 NSS_IMPLEMENT nssCryptokiObject *
-nssToken_ImportCRL
-(
+nssToken_ImportCRL (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSDER *subject,
@@ -1360,8 +1326,7 @@ nssToken_ImportCRL
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCRLs
-(
+nssToken_FindCRLs (
   NSSToken *token,
   nssSession *sessionOpt,
   nssTokenSearchType searchType,
@@ -1399,8 +1364,7 @@ nssToken_FindCRLs
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssToken_FindCRLsBySubject
-(
+nssToken_FindCRLsBySubject (
   NSSToken *token,
   nssSession *sessionOpt,
   NSSDER *subject,
@@ -1434,8 +1398,7 @@ nssToken_FindCRLsBySubject
 }
 
 NSS_IMPLEMENT PRStatus
-nssToken_GetCachedObjectAttributes
-(
+nssToken_GetCachedObjectAttributes (
   NSSToken *token,
   NSSArena *arenaOpt,
   nssCryptokiObject *object,
@@ -1453,8 +1416,7 @@ nssToken_GetCachedObjectAttributes
 }
 
 NSS_IMPLEMENT NSSItem *
-nssToken_Digest
-(
+nssToken_Digest (
   NSSToken *tok,
   nssSession *sessionOpt,
   NSSAlgorithmAndParameters *ap,
@@ -1521,8 +1483,7 @@ nssToken_Digest
 }
 
 NSS_IMPLEMENT PRStatus
-nssToken_BeginDigest
-(
+nssToken_BeginDigest (
   NSSToken *tok,
   nssSession *sessionOpt,
   NSSAlgorithmAndParameters *ap
@@ -1539,8 +1500,7 @@ nssToken_BeginDigest
 }
 
 NSS_IMPLEMENT PRStatus
-nssToken_ContinueDigest
-(
+nssToken_ContinueDigest (
   NSSToken *tok,
   nssSession *sessionOpt,
   NSSItem *item
@@ -1559,8 +1519,7 @@ nssToken_ContinueDigest
 }
 
 NSS_IMPLEMENT NSSItem *
-nssToken_FinishDigest
-(
+nssToken_FinishDigest (
   NSSToken *tok,
   nssSession *sessionOpt,
   NSSItem *rvOpt,
@@ -1612,8 +1571,7 @@ nssToken_FinishDigest
 }
 
 NSS_IMPLEMENT PRBool
-nssToken_IsPresent
-(
+nssToken_IsPresent (
   NSSToken *token
 )
 {
@@ -1630,8 +1588,7 @@ nssToken_IsPresent
  * increasing the likelihood that the cache takes care of it.
  */
 NSS_IMPLEMENT PRStatus
-nssToken_TraverseCertificates
-(
+nssToken_TraverseCertificates (
   NSSToken *token,
   nssSession *sessionOpt,
   nssTokenSearchType searchType,
@@ -1731,8 +1688,7 @@ loser:
 }
 
 NSS_IMPLEMENT PRBool
-nssToken_IsPrivateKeyAvailable
-(
+nssToken_IsPrivateKeyAvailable (
   NSSToken *token,
   NSSCertificate *c,
   nssCryptokiObject *instance
diff --git a/security/nss/lib/dev/devutil.c b/security/nss/lib/dev/devutil.c
index bf4186094..68af62c5c 100644
--- a/security/nss/lib/dev/devutil.c
+++ b/security/nss/lib/dev/devutil.c
@@ -44,8 +44,7 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$";
 #endif /* CKHELPER_H */
 
 NSS_IMPLEMENT nssCryptokiObject *
-nssCryptokiObject_Create
-(
+nssCryptokiObject_Create (
   NSSToken *t, 
   nssSession *session,
   CK_OBJECT_HANDLE h
@@ -81,8 +80,7 @@ nssCryptokiObject_Create
 }
 
 NSS_IMPLEMENT void
-nssCryptokiObject_Destroy
-(
+nssCryptokiObject_Destroy (
   nssCryptokiObject *object
 )
 {
@@ -94,8 +92,7 @@ nssCryptokiObject_Destroy
 }
 
 NSS_IMPLEMENT nssCryptokiObject *
-nssCryptokiObject_Clone
-(
+nssCryptokiObject_Clone (
   nssCryptokiObject *object
 )
 {
@@ -113,8 +110,7 @@ nssCryptokiObject_Clone
 }
 
 NSS_EXTERN PRBool
-nssCryptokiObject_Equal
-(
+nssCryptokiObject_Equal (
   nssCryptokiObject *o1,
   nssCryptokiObject *o2
 )
@@ -138,8 +134,7 @@ nssPKCS11String_Length(CK_CHAR *pkcs11Str, PRUint32 bufLen)
  */
 
 NSS_IMPLEMENT NSSSlot **
-nssSlotArray_Clone
-(
+nssSlotArray_Clone (
   NSSSlot **slots
 )
 {
@@ -162,8 +157,7 @@ nssSlotArray_Clone
 
 #ifdef PURE_STAN_BUILD
 NSS_IMPLEMENT void
-nssModuleArray_Destroy
-(
+nssModuleArray_Destroy (
   NSSModule **modules
 )
 {
@@ -178,8 +172,7 @@ nssModuleArray_Destroy
 #endif
 
 NSS_IMPLEMENT void
-nssSlotArray_Destroy
-(
+nssSlotArray_Destroy (
   NSSSlot **slots
 )
 {
@@ -193,8 +186,7 @@ nssSlotArray_Destroy
 }
 
 NSS_IMPLEMENT void
-NSSSlotArray_Destroy
-(
+NSSSlotArray_Destroy (
   NSSSlot **slots
 )
 {
@@ -202,8 +194,7 @@ NSSSlotArray_Destroy
 }
 
 NSS_IMPLEMENT void
-nssTokenArray_Destroy
-(
+nssTokenArray_Destroy (
   NSSToken **tokens
 )
 {
@@ -217,8 +208,7 @@ nssTokenArray_Destroy
 }
 
 NSS_IMPLEMENT void
-NSSTokenArray_Destroy
-(
+NSSTokenArray_Destroy (
   NSSToken **tokens
 )
 {
@@ -226,8 +216,7 @@ NSSTokenArray_Destroy
 }
 
 NSS_IMPLEMENT void
-nssCryptokiObjectArray_Destroy
-(
+nssCryptokiObjectArray_Destroy (
   nssCryptokiObject **objects
 )
 {
@@ -263,8 +252,7 @@ struct nssSlotListStr
 };
 
 NSS_IMPLEMENT nssSlotList *
-nssSlotList_Create
-(
+nssSlotList_Create (
   NSSArena *arenaOpt
 )
 {
@@ -306,8 +294,7 @@ loser:
 }
 
 NSS_IMPLEMENT void
-nssSlotList_Destroy
-(
+nssSlotList_Destroy (
   nssSlotList *slotList
 )
 {
@@ -328,8 +315,7 @@ nssSlotList_Destroy
 
 /* XXX should do allocs outside of lock */
 NSS_IMPLEMENT PRStatus
-nssSlotList_Add
-(
+nssSlotList_Add (
   nssSlotList *slotList,
   NSSSlot *slot,
   PRUint32 order
@@ -360,8 +346,7 @@ nssSlotList_Add
 }
 
 NSS_IMPLEMENT PRStatus
-nssSlotList_AddModuleSlots
-(
+nssSlotList_AddModuleSlots (
   nssSlotList *slotList,
   NSSModule *module,
   PRUint32 order
@@ -415,8 +400,7 @@ loser:
 }
 
 NSS_IMPLEMENT NSSSlot **
-nssSlotList_GetSlots
-(
+nssSlotList_GetSlots (
   nssSlotList *slotList
 )
 {
@@ -444,8 +428,7 @@ nssSlotList_GetSlots
 
 #if 0
 NSS_IMPLEMENT NSSSlot *
-nssSlotList_GetBestSlotForAlgorithmAndParameters
-(
+nssSlotList_GetBestSlotForAlgorithmAndParameters (
   nssSlotList *slotList,
   NSSAlgorithmAndParameters *ap
 )
@@ -468,8 +451,7 @@ nssSlotList_GetBestSlotForAlgorithmAndParameters
 #endif
 
 NSS_IMPLEMENT NSSSlot *
-nssSlotList_GetBestSlot
-(
+nssSlotList_GetBestSlot (
   nssSlotList *slotList
 )
 {
@@ -489,8 +471,7 @@ nssSlotList_GetBestSlot
 }
 
 NSS_IMPLEMENT NSSSlot *
-nssSlotList_FindSlotByName
-(
+nssSlotList_FindSlotByName (
   nssSlotList *slotList,
   NSSUTF8 *slotName
 )
@@ -515,8 +496,7 @@ nssSlotList_FindSlotByName
 }
 
 NSS_IMPLEMENT NSSToken *
-nssSlotList_FindTokenByName
-(
+nssSlotList_FindTokenByName (
   nssSlotList *slotList,
   NSSUTF8 *tokenName
 )
@@ -569,8 +549,7 @@ struct nssTokenObjectCacheStr
 };
 
 NSS_IMPLEMENT nssTokenObjectCache *
-nssTokenObjectCache_Create
-(
+nssTokenObjectCache_Create (
   NSSToken *token,
   PRBool cacheCerts,
   PRBool cacheTrust,
@@ -596,8 +575,7 @@ loser:
 }
 
 static void
-clear_cache
-(
+clear_cache (
   nssTokenObjectCache *cache
 )
 {
@@ -620,8 +598,7 @@ clear_cache
 }
 
 NSS_IMPLEMENT void
-nssTokenObjectCache_Clear
-(
+nssTokenObjectCache_Clear (
   nssTokenObjectCache *cache
 )
 {
@@ -633,8 +610,7 @@ nssTokenObjectCache_Clear
 }
 
 NSS_IMPLEMENT void
-nssTokenObjectCache_Destroy
-(
+nssTokenObjectCache_Destroy (
   nssTokenObjectCache *cache
 )
 {
@@ -646,8 +622,7 @@ nssTokenObjectCache_Destroy
 }
 
 NSS_IMPLEMENT PRBool
-nssTokenObjectCache_HaveObjectClass
-(
+nssTokenObjectCache_HaveObjectClass (
   nssTokenObjectCache *cache,
   CK_OBJECT_CLASS objclass
 )
@@ -665,8 +640,7 @@ nssTokenObjectCache_HaveObjectClass
 }
 
 static nssCryptokiObjectAndAttributes **
-create_object_array
-(
+create_object_array (
   nssCryptokiObject **objects,
   PRBool *doObjects,
   PRUint32 *numObjects,
@@ -699,8 +673,7 @@ create_object_array
 }
 
 static nssCryptokiObjectAndAttributes *
-create_object
-(
+create_object (
   nssCryptokiObject *object,
   CK_ATTRIBUTE_TYPE *types,
   PRUint32 numTypes,
@@ -783,8 +756,7 @@ loser:
  *
  */
 static PRBool
-search_for_objects
-(
+search_for_objects (
   nssTokenObjectCache *cache
 )
 {
@@ -818,8 +790,7 @@ search_for_objects
 }
 
 static nssCryptokiObjectAndAttributes *
-create_cert
-(
+create_cert (
   nssCryptokiObject *object,
   PRStatus *status
 )
@@ -841,8 +812,7 @@ create_cert
 }
 
 static PRStatus
-get_token_certs_for_cache
-(
+get_token_certs_for_cache (
   nssTokenObjectCache *cache
 )
 {
@@ -896,8 +866,7 @@ get_token_certs_for_cache
 }
 
 static nssCryptokiObjectAndAttributes *
-create_trust
-(
+create_trust (
   nssCryptokiObject *object,
   PRStatus *status
 )
@@ -920,8 +889,7 @@ create_trust
 }
 
 static PRStatus
-get_token_trust_for_cache
-(
+get_token_trust_for_cache (
   nssTokenObjectCache *cache
 )
 {
@@ -975,8 +943,7 @@ get_token_trust_for_cache
 }
 
 static nssCryptokiObjectAndAttributes *
-create_crl
-(
+create_crl (
   nssCryptokiObject *object,
   PRStatus *status
 )
@@ -995,8 +962,7 @@ create_crl
 }
 
 static PRStatus
-get_token_crls_for_cache
-(
+get_token_crls_for_cache (
   nssTokenObjectCache *cache
 )
 {
@@ -1050,8 +1016,7 @@ get_token_crls_for_cache
 }
 
 static CK_ATTRIBUTE_PTR
-find_attribute_in_object
-(
+find_attribute_in_object (
   nssCryptokiObjectAndAttributes *obj,
   CK_ATTRIBUTE_TYPE attrType
 )
@@ -1067,8 +1032,7 @@ find_attribute_in_object
 
 /* Find all objects in the array that match the supplied template */
 static nssCryptokiObject **
-find_objects_in_array
-(
+find_objects_in_array (
   nssCryptokiObjectAndAttributes **objArray,
   CK_ATTRIBUTE_PTR ot,
   CK_ULONG otlen,
@@ -1158,8 +1122,7 @@ loser:
 }
 
 NSS_IMPLEMENT nssCryptokiObject **
-nssTokenObjectCache_FindObjectsByTemplate
-(
+nssTokenObjectCache_FindObjectsByTemplate (
   nssTokenObjectCache *cache,
   CK_OBJECT_CLASS objclass,
   CK_ATTRIBUTE_PTR otemplate,
@@ -1213,8 +1176,7 @@ finish:
 }
 
 static PRBool
-cache_available_for_object_type
-(
+cache_available_for_object_type (
   nssTokenObjectCache *cache,
   PRUint32 objectType
 )
@@ -1235,8 +1197,7 @@ cache_available_for_object_type
 }
 
 NSS_IMPLEMENT PRStatus
-nssTokenObjectCache_GetObjectAttributes
-(
+nssTokenObjectCache_GetObjectAttributes (
   nssTokenObjectCache *cache,
   NSSArena *arenaOpt,
   nssCryptokiObject *object,
@@ -1323,8 +1284,7 @@ loser:
 }
 
 NSS_IMPLEMENT PRStatus
-nssTokenObjectCache_ImportObject
-(
+nssTokenObjectCache_ImportObject (
   nssTokenObjectCache *cache,
   nssCryptokiObject *object,
   CK_OBJECT_CLASS objclass,
@@ -1394,8 +1354,7 @@ nssTokenObjectCache_ImportObject
 }
 
 NSS_IMPLEMENT void
-nssTokenObjectCache_RemoveObject
-(
+nssTokenObjectCache_RemoveObject (
   nssTokenObjectCache *cache,
   nssCryptokiObject *object
 )
@@ -1440,8 +1399,7 @@ nssTokenObjectCache_RemoveObject
 */
 /* XXX of course this doesn't belong here */
 NSS_IMPLEMENT NSSAlgorithmAndParameters *
-NSSAlgorithmAndParameters_CreateSHA1Digest
-(
+NSSAlgorithmAndParameters_CreateSHA1Digest (
   NSSArena *arenaOpt
 )
 {
@@ -1456,8 +1414,7 @@ NSSAlgorithmAndParameters_CreateSHA1Digest
 }
 
 NSS_IMPLEMENT NSSAlgorithmAndParameters *
-NSSAlgorithmAndParameters_CreateMD5Digest
-(
+NSSAlgorithmAndParameters_CreateMD5Digest (
   NSSArena *arenaOpt
 )
 {