зеркало из https://github.com/mozilla/gecko-dev.git
Fix compiler warnings on HP, Linux, Solaris, and AIX.
This commit is contained in:
relyea%netscape.com
Родитель
c34a08d195
Коммит
b213eed507
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:24:00 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.4 $ $Date: 2001/09/20 22:09:49 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -62,7 +62,7 @@ NSS_IMPLEMENT_DATA const CK_VERSION
|
|||
nss_builtins_LibraryVersion = { 1, 0 };
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_SlotDescription = "";
|
||||
nss_builtins_SlotDescription = (NSSUTF8 *) "";
|
||||
|
||||
NSS_IMPLEMENT_DATA const CK_VERSION
|
||||
nss_builtins_HardwareVersion = { 1, 0 };
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: find.c,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:14 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: find.c,v $ $Revision: 1.2 $ $Date: 2001/09/20 22:09:45 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -134,7 +134,7 @@ nssCKFWFindObjects_Create
|
|||
CK_RV *pError
|
||||
)
|
||||
{
|
||||
NSSCKFWFindObjects *fwFindObjects;
|
||||
NSSCKFWFindObjects *fwFindObjects = NULL;
|
||||
NSSArena *arena;
|
||||
NSSCKMDSession *mdSession;
|
||||
NSSCKMDToken *mdToken;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: mutex.c,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:26 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: mutex.c,v $ $Revision: 1.2 $ $Date: 2001/09/20 22:09:46 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -136,7 +136,6 @@ nssCKFWMutex_Create
|
|||
NSSCKFWMutex *mutex;
|
||||
CK_ULONG count = (CK_ULONG)0;
|
||||
CK_BBOOL os_ok = CK_FALSE;
|
||||
CK_VOID_PTR pMutex = (CK_VOID_PTR)NULL;
|
||||
|
||||
if( (CK_C_INITIALIZE_ARGS_PTR)NULL != pInitArgs ) {
|
||||
if( (CK_CREATEMUTEX )NULL != pInitArgs->CreateMutex ) count++;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: object.c,v $ $Revision: 1.5 $ $Date: 2001/08/23 00:00:05 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: object.c,v $ $Revision: 1.6 $ $Date: 2001/09/20 22:09:46 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -948,9 +948,9 @@ NSSCKFWObject_GetAttributeTypes
|
|||
CK_ULONG ulCount
|
||||
)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
CK_RV error = CKR_OK;
|
||||
|
||||
#ifdef DEBUG
|
||||
error = nssCKFWObject_verifyPointer(fwObject);
|
||||
if( CKR_OK != error ) {
|
||||
return error;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: session.c,v $ $Revision: 1.5 $ $Date: 2000/09/13 21:15:07 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: session.c,v $ $Revision: 1.6 $ $Date: 2001/09/20 22:09:46 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -1909,9 +1909,9 @@ NSSCKFWSession_CallNotification
|
|||
CK_NOTIFICATION event
|
||||
)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
CK_RV error = CKR_OK;
|
||||
|
||||
#ifdef DEBUG
|
||||
error = nssCKFWSession_verifyPointer(fwSession);
|
||||
if( CKR_OK != error ) {
|
||||
return error;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.5 $ $Date: 2000/09/06 22:23:56 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.6 $ $Date: 2001/09/20 22:09:46 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -200,7 +200,7 @@ nss_ckmdSessionObject_GetAttributeSize
|
|||
CK_RV *pError
|
||||
);
|
||||
|
||||
static NSSItem *
|
||||
static const NSSItem *
|
||||
nss_ckmdSessionObject_GetAttribute
|
||||
(
|
||||
NSSCKMDObject *mdObject,
|
||||
|
|
@ -580,7 +580,7 @@ nss_ckmdSessionObject_GetAttributeSize
|
|||
* nss_ckmdSessionObject_GetAttribute
|
||||
*
|
||||
*/
|
||||
static NSSItem *
|
||||
static const NSSItem *
|
||||
nss_ckmdSessionObject_GetAttribute
|
||||
(
|
||||
NSSCKMDObject *mdObject,
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.4 $ $Date: 2000/09/06 22:23:57 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.5 $ $Date: 2001/09/20 22:09:46 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -1405,7 +1405,7 @@ nssCKFWToken_GetMechanismCount
|
|||
}
|
||||
#endif /* NSSDEBUG */
|
||||
|
||||
if( (void *)NULL == fwToken->mdToken->GetMechanismCount ) {
|
||||
if( (void *)NULL == (void *)fwToken->mdToken->GetMechanismCount ) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1434,7 +1434,7 @@ nssCKFWToken_GetMechanismTypes
|
|||
}
|
||||
#endif /* NSSDEBUG */
|
||||
|
||||
if( (void *)NULL == fwToken->mdToken->GetMechanismTypes ) {
|
||||
if( (void *)NULL == (void *)fwToken->mdToken->GetMechanismTypes ) {
|
||||
/*
|
||||
* This should only be called with a sufficiently-large
|
||||
* "types" array, which can only be done if GetMechanismCount
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:23:57 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.4 $ $Date: 2001/09/20 22:09:47 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -683,9 +683,8 @@ NSSCKFWC_WaitForSlotEvent
|
|||
for( i = 0; i < nSlots; i++ ) {
|
||||
if( fwSlot == slots[i] ) {
|
||||
*pSlot = (CK_SLOT_ID)(CK_ULONG)(i+1);
|
||||
return CKR_OK;
|
||||
}
|
||||
|
||||
return CKR_OK;
|
||||
}
|
||||
|
||||
error = CKR_GENERAL_ERROR; /* returned something not in the slot list */
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче