Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(185)

Unified Diff: lib/ckfw/capi/csession.c

Issue 201830043: Bug 1118245 - Apply uniform style across NSS
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/ckfw/capi/crsa.c ('k') | lib/ckfw/capi/cslot.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/ckfw/capi/csession.c
===================================================================
--- a/lib/ckfw/capi/csession.c
+++ b/lib/ckfw/capi/csession.c
@@ -2,78 +2,56 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ckcapi.h"
/*
* ckcapi/csession.c
*
- * This file implements the NSSCKMDSession object for the
+ * This file implements the NSSCKMDSession object for the
* "nss to capi" cryptoki module.
*/
-static NSSCKMDFindObjects *
-ckcapi_mdSession_FindObjectsInit
-(
- NSSCKMDSession *mdSession,
- NSSCKFWSession *fwSession,
- NSSCKMDToken *mdToken,
- NSSCKFWToken *fwToken,
- NSSCKMDInstance *mdInstance,
- NSSCKFWInstance *fwInstance,
- CK_ATTRIBUTE_PTR pTemplate,
- CK_ULONG ulAttributeCount,
- CK_RV *pError
-)
-{
- return nss_ckcapi_FindObjectsInit(fwSession, pTemplate, ulAttributeCount, pError);
+static NSSCKMDFindObjects *ckcapi_mdSession_FindObjectsInit(
+ NSSCKMDSession *mdSession, NSSCKFWSession *fwSession, NSSCKMDToken *mdToken,
+ NSSCKFWToken *fwToken, NSSCKMDInstance *mdInstance,
+ NSSCKFWInstance *fwInstance, CK_ATTRIBUTE_PTR pTemplate,
+ CK_ULONG ulAttributeCount, CK_RV *pError) {
+ return nss_ckcapi_FindObjectsInit(fwSession, pTemplate, ulAttributeCount,
+ pError);
}
-static NSSCKMDObject *
-ckcapi_mdSession_CreateObject
-(
- NSSCKMDSession *mdSession,
- NSSCKFWSession *fwSession,
- NSSCKMDToken *mdToken,
- NSSCKFWToken *fwToken,
- NSSCKMDInstance *mdInstance,
- NSSCKFWInstance *fwInstance,
- NSSArena *arena,
- CK_ATTRIBUTE_PTR pTemplate,
- CK_ULONG ulAttributeCount,
- CK_RV *pError
-)
-{
- return nss_ckcapi_CreateObject(fwSession, pTemplate, ulAttributeCount, pError);
+static NSSCKMDObject *ckcapi_mdSession_CreateObject(
+ NSSCKMDSession *mdSession, NSSCKFWSession *fwSession, NSSCKMDToken *mdToken,
+ NSSCKFWToken *fwToken, NSSCKMDInstance *mdInstance,
+ NSSCKFWInstance *fwInstance, NSSArena *arena, CK_ATTRIBUTE_PTR pTemplate,
+ CK_ULONG ulAttributeCount, CK_RV *pError) {
+ return nss_ckcapi_CreateObject(fwSession, pTemplate, ulAttributeCount,
+ pError);
}
-NSS_IMPLEMENT NSSCKMDSession *
-nss_ckcapi_CreateSession
-(
- NSSCKFWSession *fwSession,
- CK_RV *pError
-)
-{
+NSS_IMPLEMENT NSSCKMDSession *nss_ckcapi_CreateSession(
+ NSSCKFWSession *fwSession, CK_RV *pError) {
NSSArena *arena;
NSSCKMDSession *rv;
arena = NSSCKFWSession_GetArena(fwSession, pError);
- if( (NSSArena *)NULL == arena ) {
+ if ((NSSArena *)NULL == arena) {
return (NSSCKMDSession *)NULL;
}
rv = nss_ZNEW(arena, NSSCKMDSession);
- if( (NSSCKMDSession *)NULL == rv ) {
+ if ((NSSCKMDSession *)NULL == rv) {
*pError = CKR_HOST_MEMORY;
return (NSSCKMDSession *)NULL;
}
- /*
- * rv was zeroed when allocated, so we only
+ /*
+ * rv was zeroed when allocated, so we only
* need to set the non-zero members.
*/
rv->etc = (void *)fwSession;
/* rv->Close */
/* rv->GetDeviceError */
/* rv->Login */
/* rv->Logout */
« no previous file with comments | « lib/ckfw/capi/crsa.c ('k') | lib/ckfw/capi/cslot.c » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b